From 69d497ccddac2caf50a825f5a1df8fedad344cca Mon Sep 17 00:00:00 2001 From: Paul Kent Date: Sat, 25 Jul 2020 13:17:23 -0400 Subject: [PATCH 1/3] add test for issue #2767 --- .../patchtransformer/PatchTransformer_test.go | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/plugin/builtin/patchtransformer/PatchTransformer_test.go b/plugin/builtin/patchtransformer/PatchTransformer_test.go index eb287a991..ddfd744e4 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer_test.go +++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go @@ -636,3 +636,74 @@ spec: path: /canada `) } + +const aDeploymentResource = `apiVersion: apps/v1 +kind: Deployment +metadata: + name: test-deployment +spec: + template: + spec: + containers: + - image: test-image + name: test-deployment + ports: + - containerPort: 8080 + name: take-over-the-world + protocol: TCP + - containerPort: 8080 + name: disappearing-act + protocol: TCP +` + +func TestPatchTransformerSimilarArrays(t *testing.T) { + th := kusttest_test.MakeEnhancedHarness(t). + PrepBuiltin("PatchTransformer") + defer th.Reset() + th.WriteF("patch.yaml", ` +- op: add + path: /spec/rules/0/http/paths/- + value: + path: '/canada' + backend: + serviceName: hoser + servicePort: 7703 +`) + + th.RunTransformerAndCheckResult(` +apiVersion: builtin +kind: PatchTransformer +metadata: + name: test-transformer +patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: test-transformer + labels: + test-transformer: did-my-job +target: + kind: Deployment + name: test-deployment +`, aDeploymentResource, ` +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + test-transformer: did-my-job + name: test-deployment +spec: + template: + spec: + containers: + - image: test-image + name: test-deployment + ports: + - containerPort: 8080 + name: take-over-the-world + protocol: TCP + - containerPort: 8080 + name: take-over-the-world + protocol: TCP +`) +} From 729544b9f44b2892eae9d6330a94ce2983dec6cd Mon Sep 17 00:00:00 2001 From: Paul Kent Date: Sat, 25 Jul 2020 15:37:07 -0400 Subject: [PATCH 2/3] adds test for issue 2767 --- .../patchtransformer/PatchTransformer_test.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plugin/builtin/patchtransformer/PatchTransformer_test.go b/plugin/builtin/patchtransformer/PatchTransformer_test.go index ddfd744e4..8f61c4c71 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer_test.go +++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go @@ -637,6 +637,7 @@ spec: `) } +// test for https://github.com/kubernetes-sigs/kustomize/issues/2767 const aDeploymentResource = `apiVersion: apps/v1 kind: Deployment metadata: @@ -656,19 +657,12 @@ spec: protocol: TCP ` +// currently documents broken state. resulting ports: should have both +// take-over-the-world and disappearing-act on 8080 func TestPatchTransformerSimilarArrays(t *testing.T) { th := kusttest_test.MakeEnhancedHarness(t). PrepBuiltin("PatchTransformer") defer th.Reset() - th.WriteF("patch.yaml", ` -- op: add - path: /spec/rules/0/http/paths/- - value: - path: '/canada' - backend: - serviceName: hoser - servicePort: 7703 -`) th.RunTransformerAndCheckResult(` apiVersion: builtin From 34e0ade3e768aa23bb3a7541c630af0876a141c7 Mon Sep 17 00:00:00 2001 From: Paul Kent Date: Tue, 4 Aug 2020 17:25:38 -0400 Subject: [PATCH 3/3] respond to PR feedback --- .../patchtransformer/PatchTransformer_test.go | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/plugin/builtin/patchtransformer/PatchTransformer_test.go b/plugin/builtin/patchtransformer/PatchTransformer_test.go index 8f61c4c71..ac1bbb750 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer_test.go +++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go @@ -638,27 +638,8 @@ spec: } // test for https://github.com/kubernetes-sigs/kustomize/issues/2767 -const aDeploymentResource = `apiVersion: apps/v1 -kind: Deployment -metadata: - name: test-deployment -spec: - template: - spec: - containers: - - image: test-image - name: test-deployment - ports: - - containerPort: 8080 - name: take-over-the-world - protocol: TCP - - containerPort: 8080 - name: disappearing-act - protocol: TCP -` - // currently documents broken state. resulting ports: should have both -// take-over-the-world and disappearing-act on 8080 +// take-over-the-world and disappearing-act on 8080 func TestPatchTransformerSimilarArrays(t *testing.T) { th := kusttest_test.MakeEnhancedHarness(t). PrepBuiltin("PatchTransformer") @@ -679,7 +660,24 @@ patch: |- target: kind: Deployment name: test-deployment -`, aDeploymentResource, ` +`, `apiVersion: apps/v1 +kind: Deployment +metadata: + name: test-deployment +spec: + template: + spec: + containers: + - image: test-image + name: test-deployment + ports: + - containerPort: 8080 + name: take-over-the-world + protocol: TCP + - containerPort: 8080 + name: disappearing-act + protocol: TCP +`, ` apiVersion: apps/v1 kind: Deployment metadata: