Delete penultimate use of Patches field.

pkg/commands/kustfile/kustomizationfile.go

@@ -110,16 +110,17 @@ func (mf *kustomizationFile) Read() (*types.Kustomization, error) {
 	if err != nil {
 		return nil, err
 	}
-	var kustomization types.Kustomization
-	err = yaml.Unmarshal(data, &kustomization)
+	var k types.Kustomization
+	err = yaml.Unmarshal(data, &k)
 	if err != nil {
 		return nil, err
 	}
+	k.DealWithDeprecatedFields()
 	err = mf.parseCommentedFields(data)
 	if err != nil {
 		return nil, err
 	}
-	return &kustomization, err
+	return &k, err
 }
 
 func (mf *kustomizationFile) Write(kustomization *types.Kustomization) error {

pkg/commands/kustfile/kustomizationfile_test.go

@@ -50,6 +50,48 @@ func TestWriteAndRead(t *testing.T) {
 	}
 }
 
+// Deprecated fields should not survive being read.
+func TestDeprecationOfPatches(t *testing.T) {
+	hasDeprecatedFields := []byte(`
+namePrefix: acme
+patches:
+- alice
+patchesStrategicMerge:
+- bob
+`)
+	fSys := fs.MakeFakeFS()
+	fSys.WriteTestKustomizationWith(hasDeprecatedFields)
+	mf, err := NewKustomizationFile(fSys)
+	if err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	k, err := mf.Read()
+	if err != nil {
+		t.Fatalf("Couldn't read kustomization file: %v\n", err)
+	}
+	if k.NamePrefix != "acme" {
+		t.Fatalf("Unexpected name prefix")
+	}
+	if len(k.Patches) > 0 {
+		t.Fatalf("Expected nothing in Patches.")
+	}
+	if len(k.PatchesStrategicMerge) != 2 {
+		t.Fatalf(
+			"Expected len(k.PatchesStrategicMerge) == 2, got %d",
+			len(k.PatchesStrategicMerge))
+	}
+	m := make(map[string]bool)
+	for _, v := range k.PatchesStrategicMerge {
+		m[string(v)] = true
+	}
+	if _, f := m["alice"]; !f {
+		t.Fatalf("Expected alice in PatchesStrategicMerge")
+	}
+	if _, f := m["bob"]; !f {
+		t.Fatalf("Expected bob in PatchesStrategicMerge")
+	}
+}
+
 func TestNewNotExist(t *testing.T) {
 	fakeFS := fs.MakeFakeFS()
 	_, err := NewKustomizationFile(fakeFS)