kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4094 from brianpursley/merge3-test

Browse Source 
Add unit tests to cover existing behavior of three way merge and strategic merge patch
This commit is contained in:
Jeff Regan
2021-08-19 07:41:18 -07:00
committed by GitHub
parent 28707bf5df aabbea3e78
commit 6c4e8019f8
2 changed files with 435 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1476,6 +1476,181 @@ spec:
protocol: TCP
`},
//
// Test Case
//
{
description: `Add single container port and add another container port after an existing container port`,
origin: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8002
name: B
protocol: TCP
`,
update: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8004
name: D
protocol: TCP
`,
local: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8003
name: C
protocol: TCP
`,
// This test records current behavior, but this behavior might be undesirable.
// If so, feel free to change the test to pass with some improved algorithm.
expected: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8003
name: C
protocol: TCP
- containerPort: 8004
name: D
protocol: TCP
`},
//
// Test Case
//
{
description: `Add new container port after existing container ports and add another container port between existing container ports`,
origin: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8002
name: B
protocol: TCP
`,
update: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8002
name: B
protocol: TCP
- containerPort: 8004
name: D
protocol: TCP
`,
local: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8003
name: C
protocol: TCP
- containerPort: 8002
name: B
protocol: TCP
`,
expected: `
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-deployment
spec:
template:
spec:
containers:
- image: test-image
name: test-deployment
ports:
- containerPort: 8001
name: A
protocol: TCP
- containerPort: 8003
name: C
protocol: TCP
- containerPort: 8002
name: B
protocol: TCP
- containerPort: 8004
name: D
protocol: TCP
`},
{
description: `Retain local protocol`,
origin: `