add tests

kubernetes-sigs · Oct 29, 2024 · 137d5ba · 137d5ba
1 parent d526cd1
commit 137d5ba
Show file tree

Hide file tree

Showing 2 changed files with 134 additions and 0 deletions.
diff --git a/api/filters/patchstrategicmerge/patchstrategicmerge_test.go b/api/filters/patchstrategicmerge/patchstrategicmerge_test.go
@@ -940,6 +940,8 @@ spec:
       containers:
       - name: foo1
       - name: foo2
+      - name: duplicate
+        image: duplicate:1.1.0
       - name: foo3
 `,
 			patch: yaml.MustParse(`
@@ -952,6 +954,8 @@ spec:
     spec:
       containers:
       - name: foo0
+      - name: duplicate
+        image: duplicate:2.1.0
 `),
 			expected: `
 apiVersion: apps/v1
@@ -964,6 +968,8 @@ spec:
       containers:
       - name: foo1
       - name: foo2
+      - name: duplicate
+        image: duplicate:2.1.0
       - name: foo3
       - name: foo0
 `,
@@ -1047,6 +1053,66 @@ spec:
         image: test
       - name: test2
         image: test2
+`,
+		},
+		"merge to empty list": {
+			input: `
+apiVersion: apps/v1
+metadata:
+  name: myDeploy
+kind: Deployment
+`,
+			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: foo0
+`,
+		},
+		"merge with empty list": {
+			input: `
+apiVersion: apps/v1
+metadata:
+  name: myDeploy
+kind: Deployment
+spec:
+  template:
+    spec:
+      containers:
+      - name: foo0
+`,
+			patch: yaml.MustParse(`
+apiVersion: apps/v1
+metadata:
+  name: myDeploy
+kind: Deployment
+`),
+			expected: `
+apiVersion: apps/v1
+metadata:
+  name: myDeploy
+kind: Deployment
+spec:
+  template:
+    spec:
+      containers:
+      - name: foo0
 `,
 		},
 	}

diff --git a/api/krusty/baseandoverlaymedium_test.go b/api/krusty/baseandoverlaymedium_test.go
@@ -56,6 +56,15 @@ spec:
           value: bar
         ports:
         - containerPort: 80
+      - name: tg-bot
+        image: python
+        env:
+        - name: first
+          value: first
+        - name: second
+          value: second
+      - name: web-server
+        image: alpine
 `)
 }
 
@@ -94,6 +103,15 @@ spec:
         name: nginx
         ports:
         - containerPort: 80
+      - env:
+        - name: first
+          value: first
+        - name: second
+          value: second
+        image: python
+        name: tg-bot
+      - image: alpine
+        name: web-server
 ---
 apiVersion: v1
 kind: Service
@@ -176,6 +194,17 @@ spec:
             configMapKeyRef:
               name: app-env
               key: somekey
+      - name: tg-bot
+        env:
+        - name: third
+          value: third
+        - name: first
+          value: fourth
+      - name: web-server
+        image: alpine
+        env:
+        - name: foo
+          value: bar
       - name: busybox
         image: busybox
         envFrom:
@@ -237,6 +266,20 @@ spec:
         name: nginx
         ports:
         - containerPort: 80
+      - env:
+        - name: third
+          value: third
+        - name: first
+          value: fourth
+        - name: second
+          value: second
+        image: python
+        name: tg-bot
+      - env:
+        - name: foo
+          value: bar
+        image: alpine
+        name: web-server
       - envFrom:
         - configMapRef:
             name: someConfigMap
@@ -370,6 +413,17 @@ spec:
             configMapKeyRef:
               name: app-env
               key: somekey
+      - name: tg-bot
+        env:
+        - name: third
+          value: third
+        - name: first
+          value: fourth
+      - name: web-server
+        image: alpine
+        env:
+        - name: foo
+          value: bar
       - name: busybox
         image: busybox
         envFrom:
@@ -433,6 +487,20 @@ spec:
         name: nginx
         ports:
         - containerPort: 80
+      - env:
+        - name: first
+          value: fourth
+        - name: second
+          value: second
+        - name: third
+          value: third
+        image: python
+        name: tg-bot
+      - env:
+        - name: foo
+          value: bar
+        image: alpine
+        name: web-server
       - envFrom:
         - configMapRef:
             name: someConfigMap