kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

changed port merge key back to containerport

Browse Source
This commit is contained in:
Natasha Sarkar
2020-10-15 11:43:14 -07:00
parent a7ba93b1d8
commit ee9a4f2526
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/Makefile
View File

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

4
kyaml/openapi/kubernetesapi/swagger.go
View File

File diff suppressed because one or more lines are too long

2
kyaml/openapi/kubernetesapi/swagger.json
View File

@@ -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": {