diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go index a76dfc75c..fede27ba0 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go @@ -13,7 +13,7 @@ import ( kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) -// TODO(#3304) +// TODO(#3304): DECISION - OK to move to kyaml and not do conflict detection. const skipConflictDetectionTests = konfig.FlagEnableKyamlDefaultValue func errorContains(err error, possibilities ...string) bool { @@ -609,6 +609,7 @@ spec: // when patch1 and patch2 are merged, so the patch // applied is effectively only patch2.yaml. // So it cannot delete the "B: Y" + // TODO(#3304): DECISION - undecided. konfig.IfApiMachineryElseKyaml(` apiVersion: example.com/v1 kind: Foo @@ -656,7 +657,7 @@ spec: resMap, // This time only patch2 was applied. Same answer on the kyaml // path, but different answer on apimachinery path (B becomes "true"?) - // The kyaml path is doing better here. + // TODO(#3304): DECISION - kyaml doing better here, not a bug. konfig.IfApiMachineryElseKyaml(` apiVersion: example.com/v1 kind: Foo @@ -779,7 +780,6 @@ spec: // Note that for SMP/WithSchema merge, the name:nginx entry // is mandatory func addLabelAndEnvPatch(kind string) string { - res := ` apiVersion: apps/v1 kind: %s diff --git a/plugin/builtin/secretgenerator/SecretGenerator_test.go b/plugin/builtin/secretgenerator/SecretGenerator_test.go index 7a418ec6c..6f4b04a8e 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator_test.go +++ b/plugin/builtin/secretgenerator/SecretGenerator_test.go @@ -44,15 +44,7 @@ literals: - VEGETABLE=carrot `) - obscure := `obscure: CkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LApjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuCg==` - if konfig.FlagEnableKyamlDefaultValue { - // The kyaml code does a better job of line wrapping. - obscure = `obscure: | - CkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LApjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIG - VsaXQuCg==` - } - - th.AssertActualEqualsExpected(rm, fmt.Sprintf(` + expFmt := ` apiVersion: v1 data: DB_PASSWORD: aWxvdmV5b3U= @@ -65,5 +57,18 @@ metadata: name: mySecret namespace: whatever type: Opaque -`, obscure)) +` + th.AssertActualEqualsExpected( + rm, + // TODO(#3304): DECISION - kyaml doing better here, not a bug. + konfig.IfApiMachineryElseKyaml( + fmt.Sprintf( + expFmt, + `obscure: CkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LApjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuCg==`), + fmt.Sprintf( + expFmt, + `obscure: | + CkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LApjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIG + VsaXQuCg==`), + )) }