diff --git a/api/filters/patchstrategicmerge/patchstrategicmerge_test.go b/api/filters/patchstrategicmerge/patchstrategicmerge_test.go index 23ca7d895..d21439c8c 100644 --- a/api/filters/patchstrategicmerge/patchstrategicmerge_test.go +++ b/api/filters/patchstrategicmerge/patchstrategicmerge_test.go @@ -31,6 +31,83 @@ apiVersion: apps/v1 metadata: name: yourDeploy kind: Deployment +`, + }, + "container patch": { + input: ` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + containers: + - name: foo1 + - name: foo2 + - name: foo3 +`, + patch: yaml.MustParse(` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + containers: + - name: foo0 +`), + expected: ` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + containers: + - name: foo1 + - name: foo2 + - name: foo3 + - name: foo0 +`, + }, + "volumes patch": { + input: ` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo1 + - name: foo2 + - name: foo3 +`, + patch: yaml.MustParse(` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo0 +`), + expected: ` +apiVersion: apps/v1 +metadata: + name: myDeploy +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo0 `, }, "nested patch": { diff --git a/kyaml/yaml/merge2/list_test.go b/kyaml/yaml/merge2/list_test.go index 78f2da912..172e22d15 100644 --- a/kyaml/yaml/merge2/list_test.go +++ b/kyaml/yaml/merge2/list_test.go @@ -38,6 +38,39 @@ spec: - name: foo3 `, }, + {description: `merge k8s deployment volumes`, + source: ` +apiVersion: apps/v1 +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo1 + - name: foo2 + - name: foo3 +`, + dest: ` +apiVersion: apps/v1 +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo0 +`, + expected: ` +apiVersion: apps/v1 +kind: Deployment +spec: + template: + spec: + volumes: + - name: foo1 + - name: foo2 + - name: foo3 +`, + }, {description: `replace List -- different value in dest`, source: `