kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Implement code review changes for ResId.Equals instead of ResId.GkvnEquals

Browse Source
This commit is contained in:
Jerome Brette
2019-07-18 14:00:59 -05:00
parent 5116e2f210
commit f363acf839
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go
View File

@@ -688,8 +688,9 @@ spec:
} }
// utility method building the expected output of a JMP. // utility method building the expected output of a JMP.
// TODO(jeb): imagename parameter is only here to deal with what // imagename parameter allows to build a result consistent
// seems to be a bug in conflictdetector and JMP. // with the JMP behavior which basically overrides the
// entire "containers" list.
func expectedResultJMP(imagename string) string { func expectedResultJMP(imagename string) string {
res := `apiVersion: apps/v1 res := `apiVersion: apps/v1
@@ -710,8 +711,6 @@ spec:
name: nginx name: nginx
` `
// This piece of code is only here to deal
// a bug in conflictdetector
if imagename == "" { if imagename == "" {
return res return res
} }
@@ -808,10 +807,10 @@ paths:
return config return config
} }
// TestOverlayRun validates the single patch use cases // TestSinglePatch validates the single patch use cases
// regarless of the schema availibility, which in turns // regarless of the schema availibility, which in turns
// relies on StrategicMergePatch or simple JSON Patch. // relies on StrategicMergePatch or simple JSON Patch.
func TestOverlayRun(t *testing.T) { func TestSinglePatch(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
base string base string
@@ -1038,7 +1037,9 @@ func TestMultiplePatchesWithConflict(t *testing.T) {
changeImagePatch(MyCRD, "nginx:1.7.9"), changeImagePatch(MyCRD, "nginx:1.7.9"),
}, },
errorExpected: false, errorExpected: false,
//TODO(jeb): Why is there no conflict detected ? // There is no conflict detected. It should
// be but the JMPConflictDector ignores it.
// See https://github.com/kubernetes-sigs/kustomize/issues/1370
expected: expectedResultJMP("nginx:1.7.9"), expected: expectedResultJMP("nginx:1.7.9"),
}, },
{ {
@@ -1050,7 +1051,9 @@ func TestMultiplePatchesWithConflict(t *testing.T) {
changeImagePatch(MyCRD, "nginx:latest"), changeImagePatch(MyCRD, "nginx:latest"),
}, },
errorExpected: false, errorExpected: false,
//TODO(jeb): Why is there no conflict detected ? // There is no conflict detected. It should
// be but the JMPConflictDector ignores it.
// See https://github.com/kubernetes-sigs/kustomize/issues/1370
expected: expectedResultJMP("nginx:latest"), expected: expectedResultJMP("nginx:latest"),
}, },
{ {