Merge pull request #4165 from natasha41575/nameRefAfterKindChange

update name references after kind change
kubernetes-sigs · Sep 3, 2021 · 4d002af · 4d002af
2 parents 2bfc7cc + 0244f09
commit 4d002af
Show file tree

Hide file tree

Showing 2 changed files with 165 additions and 0 deletions.
diff --git a/api/filters/nameref/nameref.go b/api/filters/nameref/nameref.go
@@ -56,6 +56,7 @@ func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
 		// sanity check.
 		return nil, err
 	}
+	f.NameFieldToUpdate.Gvk = f.Referrer.GetGvk()
 	if err := node.PipeE(fieldspec.Filter{
 		FieldSpec: f.NameFieldToUpdate,
 		SetValue:  f.set,

diff --git a/api/krusty/gvknpatch_test.go b/api/krusty/gvknpatch_test.go
@@ -685,3 +685,167 @@ spec:
             name: new-name
 `)
 }
+
+func TestNameReferenceAfterJsonPatch(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	th.WriteF("resources.yaml", `
+apiVersion: v1
+data:
+  bar: bar
+kind: ConfigMap
+metadata:
+  name: cm
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: foo
+spec:
+  selector:
+    matchLabels:
+      foo: foo
+  template:
+    metadata:
+      labels:
+        foo: foo
+    spec:
+      containers:
+      - name: foo
+        image: example
+        volumeMounts:
+        - mountPath: /path
+          name: myvol
+      volumes:
+      - configMap:
+          name: cm
+        name: myvol
+`)
+	th.WriteK(".", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namePrefix: foo-
+resources:
+- resources.yaml
+patches:
+- target:
+    group: apps
+    version: v1
+    name: foo
+  patch: |
+    - op: replace
+      path: /kind
+      value: Deployment
+`)
+	m := th.Run(".", th.MakeDefaultOptions())
+	th.AssertActualEqualsExpected(m, `apiVersion: v1
+data:
+  bar: bar
+kind: ConfigMap
+metadata:
+  name: foo-cm
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: foo-foo
+spec:
+  selector:
+    matchLabels:
+      foo: foo
+  template:
+    metadata:
+      labels:
+        foo: foo
+    spec:
+      containers:
+      - image: example
+        name: foo
+        volumeMounts:
+        - mountPath: /path
+          name: myvol
+      volumes:
+      - configMap:
+          name: foo-cm
+        name: myvol
+`)
+}
+
+func TestNameReferenceAfterJsonPatchConfigMapGenerator(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	th.WriteF("statefulset.yaml", `
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: foo
+spec:
+  selector:
+    matchLabels:
+      foo: foo
+  template:
+    metadata:
+      labels:
+        foo: foo
+    spec:
+      containers:
+      - name: foo
+        image: example
+        volumeMounts:
+        - mountPath: /path
+          name: myvol
+      volumes:
+      - configMap:
+          name: cm
+        name: myvol
+`)
+	th.WriteK(".", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- statefulset.yaml
+patches:
+- target:
+    group: apps
+    version: v1
+    name: foo
+  patch: |
+    - op: replace
+      path: /kind
+      value: Deployment
+configMapGenerator:
+- name: cm
+  literals:
+  - bar=bar
+`)
+	m := th.Run(".", th.MakeDefaultOptions())
+	th.AssertActualEqualsExpected(m, `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: foo
+spec:
+  selector:
+    matchLabels:
+      foo: foo
+  template:
+    metadata:
+      labels:
+        foo: foo
+    spec:
+      containers:
+      - image: example
+        name: foo
+        volumeMounts:
+        - mountPath: /path
+          name: myvol
+      volumes:
+      - configMap:
+          name: cm-8hm8224gfd
+        name: myvol
+---
+apiVersion: v1
+data:
+  bar: bar
+kind: ConfigMap
+metadata:
+  name: cm-8hm8224gfd
+`)
+}