Removing YAMLSupport==false code path.

This continues work on the master and v3.8.* branches
to eliminate apimachinery dependence.

plugin/builtin/patchtransformer/PatchTransformer_test.go

@@ -4,7 +4,6 @@
 package main_test
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 
@@ -278,7 +277,11 @@ spec:
 }
 
 func TestPatchTransformerSmpSidecars(t *testing.T) {
-	patch := `
+	th := kusttest_test.MakeEnhancedHarness(t).
+		PrepBuiltin("PatchTransformer")
+	defer th.Reset()
+
+	th.WriteF("patch.yaml", `
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -287,100 +290,23 @@ spec:
   template:
     spec:
       containers:
-        - name: istio-proxy
-          image: docker.io/istio/proxyv2
-          args:
-          - proxy
-          - sidecar
-`
+      - name: istio-proxy
+        image: docker.io/istio/proxyv2
+        args:
+        - proxy
+        - sidecar
+`)
 
-	config := `
+	rm := th.LoadAndRunTransformer(`
 apiVersion: builtin
 kind: PatchTransformer
 metadata:
   name: notImportantHere
-yamlSupport: %t
 path: patch.yaml
 target:
   name: myDeploy
-`
-
-	// The expected results with and without yamlSupport is
-	// slightly different for this test. This is because
-	// the two different implementations order the results
-	// differently.
-	testCases := []struct {
-		testName       string
-		yamlSupport    bool
-		expectedOutput string
-	}{
-		{
-			testName:    "yaml=false",
-			yamlSupport: false,
-			expectedOutput: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    old-label: old-value
-  name: myDeploy
-spec:
-  replica: 2
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - args:
-        - proxy
-        - sidecar
-        image: docker.io/istio/proxyv2
-        name: istio-proxy
-      - image: nginx
-        name: nginx
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    new-label: new-value
-  name: yourDeploy
-spec:
-  replica: 1
-  template:
-    metadata:
-      labels:
-        new-label: new-value
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx
----
-apiVersion: apps/v1
-kind: MyKind
-metadata:
-  label:
-    old-label: old-value
-  name: myDeploy
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - args:
-        - proxy
-        - sidecar
-        image: docker.io/istio/proxyv2
-        name: istio-proxy
-`,
-		},
-		{
-			testName:    "yaml=true",
-			yamlSupport: true,
-			expectedOutput: `
+`, someDeploymentResources)
+	th.AssertActualEqualsExpected(rm, `
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -438,24 +364,7 @@ spec:
         - sidecar
         image: docker.io/istio/proxyv2
         name: istio-proxy
-`,
-		},
-	}
-
-	for i := range testCases {
-		tc := testCases[i]
-		t.Run(tc.testName, func(t *testing.T) {
-			th := kusttest_test.MakeEnhancedHarness(t).
-				PrepBuiltin("PatchTransformer")
-			defer th.Reset()
-
-			th.WriteF("patch.yaml", patch)
-
-			c := fmt.Sprintf(config, tc.yamlSupport)
-			rm := th.LoadAndRunTransformer(c, someDeploymentResources)
-			th.AssertActualEqualsExpected(rm, tc.expectedOutput)
-		})
-	}
+`)
 }
 
 func TestPatchTransformerWithInlineJson(t *testing.T) {