Merge pull request #1310 from 100mik/kctrl-build-values-fix

Ensure that `--build-values` does not affect package output

cli/pkg/kctrl/cmd/app/release/app_spec_builder.go

@@ -65,7 +65,7 @@ func (b *AppSpecBuilder) Build() (kcv1alpha1.AppSpec, error) {
 					Git: &kcv1alpha1.AppFetchGit{},
 				},
 			},
-			Template: b.opts.BuildTemplate,
+			Template: b.deepCopyAppTemplateList(b.opts.BuildTemplate),
 			Deploy:   b.opts.BuildDeploy,
 		},
 	}
@@ -169,3 +169,12 @@ func (b *AppSpecBuilder) checkForErrorsAfterReconciliation(app kcv1alpha1.App, f
 	}
 	return nil
 }
+
+func (b *AppSpecBuilder) deepCopyAppTemplateList(src []kcv1alpha1.AppTemplate) []kcv1alpha1.AppTemplate {
+	copy := []kcv1alpha1.AppTemplate{}
+	for _, templateStep := range src {
+		templateStepCopy := templateStep.DeepCopy()
+		copy = append(copy, *templateStepCopy)
+	}
+	return copy
+}

cli/test/e2e/build_values_test.go

@@ -160,6 +160,13 @@ namespace: test
 
 		// Verify that validation checks are not performed while running ytt to build packages
 		kappCtrl.RunWithOpts([]string{"package", "release", "--chdir", workingDir, "--build-values", "build-values.yml"}, RunOpts{NoNamespace: true})
+
+		// Ensure that flag does not affect package output
+		packageFile, err := os.ReadFile(path.Join(workingDir, "carvel-artifacts", "packages", "samplepackage.corp.com", "package.yml"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		require.NotContains(t, string(packageFile), "valuesFrom")
 	})
 }
 
@@ -313,5 +320,12 @@ fooVal: bar
 			t.Fatal(err)
 		}
 		kappCtrl.RunWithOpts([]string{"package", "release", "--chdir", workingDir, "--build-values", "build-values.yml"}, RunOpts{NoNamespace: true})
+
+		// Ensure that flag does not affect package output
+		packageFile, err := os.ReadFile(path.Join(workingDir, "carvel-artifacts", "packages", "samplepackage.corp.com", "package.yml"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		require.NotContains(t, string(packageFile), "valuesFrom")
 	})
 }