Merge pull request #10110 from johngmyers/automated-cherry-pick-of-#10106-upstream-release-1.19

Automated cherry pick of #10106: Remove dependency of TerraformJSON feature flag

Author: k8s-ci-robot

cmd/kops/integration_test.go

@@ -194,9 +194,9 @@ func TestBastionAdditionalUserData(t *testing.T) {
 
 // TestMinimalJSON runs the test on a minimal data set and outputs JSON
 func TestMinimalJSON(t *testing.T) {
-	featureflag.ParseFlags("+TerraformJSON,-Terraform-0.12")
+	featureflag.ParseFlags("+TerraformJSON")
 	unsetFeaureFlag := func() {
-		featureflag.ParseFlags("-TerraformJSON,+Terraform-0.12")
+		featureflag.ParseFlags("-TerraformJSON")
 	}
 	defer unsetFeaureFlag()
 	newIntegrationTest("minimal-json.example.com", "minimal-json").withJSONOutput().runTestTerraformAWS(t)

upup/pkg/fi/cloudup/apply_cluster.go

@@ -724,7 +724,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
 		checkExisting = false
 		outDir := c.OutDir
 		tfVersion := terraform.Version011
-		if featureflag.Terraform012.Enabled() {
+		if featureflag.Terraform012.Enabled() && !featureflag.TerraformJSON.Enabled() {
 			tfVersion = terraform.Version012
 		}
 		tf := terraform.NewTerraformTarget(cloud, region, project, outDir, tfVersion, cluster.Spec.Target)

upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go

@@ -216,7 +216,7 @@ func (t *LaunchTemplate) RenderTerraform(target *terraform.TerraformTarget, a, e
 			return err
 		}
 		if d != nil {
-			if featureflag.Terraform012.Enabled() {
+			if featureflag.Terraform012.Enabled() && !featureflag.TerraformJSON.Enabled() {
 				userDataResource := fi.WrapResource(fi.NewBytesResource(d))
 
 				tf.UserData, err = target.AddFile("aws_launch_template", fi.StringValue(e.Name), "user_data", userDataResource, true)