Merge pull request #3102 from natasha41575/rollbackPortMergeKey

changed port merge key back to containerPort

kyaml/Makefile

@@ -35,11 +35,7 @@ test:
 vet:
 	go vet ./...
 
-# sed command was added to resolve https://github.com/kubernetes-sigs/kustomize/issues/2767
-# it changes the ports merge key in kyaml/openapi/kubernetesapi/swagger.json
-# likely related to https://github.com/kubernetes/kubernetes/issues/39188
 openapi:
-	sed -i 's/"x-kubernetes-patch-merge-key": "containerPort"/"x-kubernetes-patch-merge-key": "name"/g' 'openapi/kubernetesapi/swagger.json'
 	(which $(GOPATH)/bin/go-bindata || go get -u github.com/go-bindata/go-bindata/...)
 	$(GOPATH)/bin/go-bindata --pkg kubernetesapi -o openapi/kubernetesapi/swagger.go openapi/kubernetesapi/swagger.json
 	$(GOPATH)/bin/go-bindata --pkg kustomizationapi -o openapi/kustomizationapi/swagger.go openapi/kustomizationapi/swagger.json

kyaml/openapi/kubernetesapi/swagger.json

@@ -5102,7 +5102,7 @@
             "protocol"
           ],
           "x-kubernetes-list-type": "map",
-          "x-kubernetes-patch-merge-key": "name",
+          "x-kubernetes-patch-merge-key": "containerPort",
           "x-kubernetes-patch-strategy": "merge"
         },
         "readinessProbe": {

plugin/builtin/patchtransformer/PatchTransformer_test.go

@@ -693,9 +693,8 @@ spec:
 }
 
 // test for https://github.com/kubernetes-sigs/kustomize/issues/2767
-// resolved with a sed command in kyaml/Makefile that edits the file
-// kyaml/openapi/kubernetesapi/swagger.json to change the ports merge key
-// likely related to https://github.com/kubernetes/kubernetes/issues/39188
+// currently documents broken state.  resulting ports: should have both
+// take-over-the-world and disappearing-act on 8080
 func TestPatchTransformerSimilarArrays(t *testing.T) {
 	th := kusttest_test.MakeEnhancedHarness(t).
 		PrepBuiltin("PatchTransformer")
@@ -747,9 +746,6 @@ spec:
       - image: test-image
         name: test-deployment
         ports:
-        - containerPort: 8080
-          name: take-over-the-world
-          protocol: TCP
         - containerPort: 8080
           name: disappearing-act
           protocol: TCP