github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

update generated files

Browse Source
This commit is contained in:
ymqytw 2017-08-08 09:29:40 -07:00
parent 838c47ee10
commit 9b05e2644f
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/openapi-spec/swagger.json
View File

@ -60953,7 +60953,7 @@
"$ref": "#/definitions/io.k8s.api.core.v1.Volume" "$ref": "#/definitions/io.k8s.api.core.v1.Volume"
}, },
"x-kubernetes-patch-merge-key": "name", "x-kubernetes-patch-merge-key": "name",
"x-kubernetes-patch-strategy": "merge" "x-kubernetes-patch-strategy": "merge,retainKeys"
} }
} }
}, },
@ -62772,6 +62772,7 @@
}, },
"strategy": { "strategy": {
"description": "The deployment strategy to use to replace existing pods with new ones.", "description": "The deployment strategy to use to replace existing pods with new ones.",
"x-kubernetes-patch-strategy": "retainKeys",
"$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStrategy" "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStrategy"
}, },
"template": { "template": {

3
federation/apis/openapi-spec/swagger.json
View File

@ -11237,7 +11237,7 @@
"$ref": "#/definitions/io.k8s.api.core.v1.Volume" "$ref": "#/definitions/io.k8s.api.core.v1.Volume"
}, },
"x-kubernetes-patch-merge-key": "name", "x-kubernetes-patch-merge-key": "name",
"x-kubernetes-patch-strategy": "merge" "x-kubernetes-patch-strategy": "merge,retainKeys"
} }
} }
}, },
@ -12530,6 +12530,7 @@
}, },
"strategy": { "strategy": {
"description": "The deployment strategy to use to replace existing pods with new ones.", "description": "The deployment strategy to use to replace existing pods with new ones.",
"x-kubernetes-patch-strategy": "retainKeys",
"$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStrategy" "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.DeploymentStrategy"
}, },
"template": { "template": {

2
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -2714,7 +2714,7 @@ message PodSpec {
// More info: https://kubernetes.io/docs/concepts/storage/volumes // More info: https://kubernetes.io/docs/concepts/storage/volumes
// +optional // +optional
// +patchMergeKey=name // +patchMergeKey=name
// +patchStrategy=merge // +patchStrategy=merge,retainKeys
repeated Volume volumes = 1; repeated Volume volumes = 1;
// List of initialization containers belonging to the pod. // List of initialization containers belonging to the pod.

1
staging/src/k8s.io/api/extensions/v1beta1/generated.proto
View File

@ -276,6 +276,7 @@ message DeploymentSpec {
// The deployment strategy to use to replace existing pods with new ones. // The deployment strategy to use to replace existing pods with new ones.
// +optional // +optional
// +patchStrategy=retainKeys
optional DeploymentStrategy strategy = 4; optional DeploymentStrategy strategy = 4;
// Minimum number of seconds for which a newly created pod should be ready // Minimum number of seconds for which a newly created pod should be ready