Annotate decisions on issue 3304 in plugins.

This commit is contained in:
monopole
2021-01-16 08:08:39 -08:00
parent 550a89295a
commit 11dce34407
2 changed files with 18 additions and 13 deletions

View File

@@ -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