Merge pull request #3557 from natasha41575/PatchMergeIssue

fixed ports merging issue and refactored some kyaml/walk code
2026-06-10 16:42:51 +00:00 · 2021-02-09 08:48:19 -08:00
parent 44edfa87fe 71f4cecb4c
commit 2fe85be932
6 changed files with 145 additions and 125 deletions
--- a/api/filters/patchstrategicmerge/patchstrategicmerge_test.go
+++ b/api/filters/patchstrategicmerge/patchstrategicmerge_test.go
@@ -723,12 +723,12 @@ spec:
      - name: consul
        image: "hashicorp/consul:1.9.1"
        ports:
+        - containerPort: 8301
+          protocol: "TCP"
+        - containerPort: 8301
+          protocol: "UDP"
        - containerPort: 8500
          name: http
-        - containerPort: 8301
-          protocol: "UDP"
-        - containerPort: 8301
-          protocol: "UDP"
 `,
 		},
 	}