Merge pull request #498 from justinsb/fix_486

Don't add terraform to --out

cmd/kops/create_cluster.go

@@ -116,7 +116,11 @@ func (c *CreateClusterCmd) Run(args []string) error {
 	// TODO: Reuse rootCommand stateStore logic?
 
 	if c.OutDir == "" {
-		c.OutDir = "out"
+		if c.Target == cloudup.TargetTerraform {
+			c.OutDir = "out/terraform"
+		} else {
+			c.OutDir = "out"
+		}
 	}
 
 	clusterRegistry, err := rootCommand.ClusterRegistry()

cmd/kops/update_cluster.go

@@ -67,7 +67,11 @@ func (c *UpdateClusterCmd) Run(args []string) error {
 	}
 
 	if c.OutDir == "" {
-		c.OutDir = "out"
+		if c.Target == cloudup.TargetTerraform {
+			c.OutDir = "out/terraform"
+		} else {
+			c.OutDir = "out"
+		}
 	}
 
 	clusterRegistry, cluster, err := rootCommand.Cluster()

docs/arguments.md

@@ -55,3 +55,7 @@ Values:
 * `external` updates are performed by an external system (or manually), should not be automatically applied
 
 * unset means to use the default policy, which is currently to apply OS security updates unless they require a reboot
+
+## out
+
+`out` determines the directory into which kubectl will write the target output.  It defaults to `out/terraform`

upup/pkg/fi/cloudup/apply_cluster.go

@@ -467,7 +467,7 @@ func (c *ApplyClusterCmd) Run() error {
 
 	case TargetTerraform:
 		checkExisting = false
-		outDir := path.Join(c.OutDir, "terraform")
+		outDir := c.OutDir
 		target = terraform.NewTerraformTarget(cloud, region, project, outDir)
 
 	case TargetDryRun: