kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

use merge key tuple instead of single merge key

Browse Source
This commit is contained in:
Natasha Sarkar
2020-11-09 11:29:21 -08:00
parent f4d8ebb1da
commit df0576a270
5 changed files with 258 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kyaml/yaml/merge3/element_test.go
View File

@@ -1211,8 +1211,8 @@ spec:
ports:
- containerPort: 80
protocol: HTTP
- protocol: TCP
containerPort: 8080
- containerPort: 8080
protocol: TCP
`},
{
@@ -1330,7 +1330,7 @@ spec:
ports:
- containerPort: 8080
protocol: UDP
`, // output should have both
`,
expected: `
apiVersion: apps/v1
kind: Deployment
@@ -1343,6 +1343,8 @@ spec:
ports:
- containerPort: 8080
protocol: UDP
- containerPort: 8080
protocol: TCP
`},
//
@@ -1378,7 +1380,7 @@ spec:
ports:
- containerPort: 8080
protocol: TCP
`, // output should have both
`,
expected: `
apiVersion: apps/v1
kind: Deployment
@@ -1389,6 +1391,8 @@ spec:
- image: test-image
name: test-deployment
ports:
- containerPort: 8080
protocol: TCP
- containerPort: 8080
protocol: UDP
`},
@@ -1468,8 +1472,11 @@ spec:
protocol: UDP
name: original
- containerPort: 8080
protocol: UDP
name: original
protocol: HTTP
name: local
- containerPort: 8080
name: updated
protocol: TCP
`},
{
@@ -1531,6 +1538,8 @@ spec:
- image: test-image
name: test-deployment
ports:
- containerPort: 8080
protocol: HTTP
- containerPort: 8080
protocol: TCP
`},