Use OpenAPI when merging (3way) resources

- When merging (3way) resources use the patch strategy from the openAPI if the definition exists for the field
- Allow disabling of guessing patch strategy merge keys when no definition exists
- Support defining strategy and key directly on configuration fields through line and header coments
- Support attaching schema to parent fields of lists, and propagating -- e.g. that a field is a PodTemplate

kyaml/yaml/merge2/merge2_test.go

@@ -17,24 +17,27 @@ var testCases = [][]testCase{scalarTestCases, listTestCases, elementTestCases, m
 
 func TestMerge(t *testing.T) {
 	for i := range testCases {
-		for _, tc := range testCases[i] {
-			actual, err := MergeStrings(tc.source, tc.dest)
-			if !assert.NoError(t, err, tc.description) {
-				t.FailNow()
-			}
-			e, err := filters.FormatInput(bytes.NewBufferString(tc.expected))
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-			estr := strings.TrimSpace(e.String())
-			a, err := filters.FormatInput(bytes.NewBufferString(actual))
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-			astr := strings.TrimSpace(a.String())
-			if !assert.Equal(t, estr, astr, tc.description) {
-				t.FailNow()
-			}
+		for j := range testCases[i] {
+			tc := testCases[i][j]
+			t.Run(tc.description, func(t *testing.T) {
+				actual, err := MergeStrings(tc.source, tc.dest, !tc.noInfer)
+				if !assert.NoError(t, err, tc.description) {
+					t.FailNow()
+				}
+				e, err := filters.FormatInput(bytes.NewBufferString(tc.expected))
+				if !assert.NoError(t, err) {
+					t.FailNow()
+				}
+				estr := strings.TrimSpace(e.String())
+				a, err := filters.FormatInput(bytes.NewBufferString(actual))
+				if !assert.NoError(t, err) {
+					t.FailNow()
+				}
+				astr := strings.TrimSpace(a.String())
+				if !assert.Equal(t, estr, astr, tc.description) {
+					t.FailNow()
+				}
+			})
 		}
 	}
 }
@@ -44,4 +47,5 @@ type testCase struct {
 	source      string
 	dest        string
 	expected    string
+	noInfer     bool
 }