kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-17 17:52:12 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

updated schema to fix port merging issue

Browse Source
This commit is contained in:
Natasha Sarkar
2020-10-06 14:30:30 -07:00
parent 68f67c183e
commit ad01d8d34e
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kyaml/Makefile
View File

@@ -35,6 +35,7 @@ vet:
go vet ./... go vet ./...
openapi: 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 -v github.com/go-bindata/go-bindata) (which $(GOPATH)/bin/go-bindata || go get -v 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 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 $(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" "protocol"
], ],
"x-kubernetes-list-type": "map", "x-kubernetes-list-type": "map",
"x-kubernetes-patch-merge-key": "containerPort", "x-kubernetes-patch-merge-key": "name",
"x-kubernetes-patch-strategy": "merge" "x-kubernetes-patch-strategy": "merge"
}, },
"readinessProbe": { "readinessProbe": {

2
kyaml/openapi/kustomizationapi/swagger.go
View File

@@ -95,7 +95,7 @@ func openapiKustomizationapiSwaggerJson() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "openapi/kustomizationapi/swagger.json", size: 3127, mode: os.FileMode(420), modTime: time.Unix(1586909905, 0)} info := bindataFileInfo{name: "openapi/kustomizationapi/swagger.json", size: 3127, mode: os.FileMode(420), modTime: time.Unix(1602011464, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }

3
plugin/builtin/patchtransformer/PatchTransformer_test.go
View File

@@ -746,6 +746,9 @@ spec:
- image: test-image - image: test-image
name: test-deployment name: test-deployment
ports: ports:
- containerPort: 8080
name: take-over-the-world
protocol: TCP
- containerPort: 8080 - containerPort: 8080
name: disappearing-act name: disappearing-act
protocol: TCP protocol: TCP