Merge pull request #1152 from Liujingfang1/patchfix

fix the bug for patching CRDs

k8sdeps/transformer/patch/transformer.go

@@ -97,8 +97,8 @@ func (tf *transformer) Transform(baseResourceMap resmap.ResMap) error {
 				return err
 			}
 		}
-		base.SetName(baseName)
 		baseResourceMap[id].SetMap(merged)
+		base.SetName(baseName)
 	}
 	return nil
 }

pkg/target/crd_test.go

@@ -295,7 +295,7 @@ spec:
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
-	// TODO(#669): Bee's name should be "prod-x-bee", not "prod-bee".
+
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 data:
@@ -310,14 +310,14 @@ metadata:
   name: prod-x-mykind
 spec:
   beeRef:
-    name: prod-bee
+    name: prod-x-bee
   secretRef:
     name: prod-x-crdsecret
 ---
 apiVersion: v1beta1
 kind: Bee
 metadata:
-  name: prod-bee
+  name: prod-x-bee
 spec:
   action: makehoney
 `)

pkg/target/customconfig_test.go

@@ -274,15 +274,14 @@ spec:
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
-	// TODO(#669): The name of AnimalPark should be x-o-sandiego,
-	// not o-sandiego, since AnimalPark appears in the base.
+
 	th.AssertActualEqualsExpected(m, `
 kind: AnimalPark
 metadata:
   labels:
     app: myApp
     movie: planetOfTheApes
-  name: o-sandiego
+  name: o-x-sandiego
 spec:
   food:
   - mimosa