github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-04-12 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70260 from lavalamp/schema-fix

Browse Source 
bump kube-openapi dep

Kubernetes-commit: 6f897af2daffd8cd3539f1ef279b9f9bc280d98f
This commit is contained in:
Kubernetes Publisher
2018-10-31 23:04:56 -07:00
parent dcc8aa9d76 a5ec744ada
commit 8c6eeb11d7
27 changed files with 589 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/k8s.io/api/apps/v1beta2/generated.proto
Generated Vendored
+1
View File
@@ -286,6 +286,7 @@ message DeploymentSpec {
// The deployment strategy to use to replace existing pods with new ones.
// +optional
// +patchStrategy=retainKeys
optional DeploymentStrategy strategy = 4;
// Minimum number of seconds for which a newly created pod should be ready
vendor/k8s.io/api/apps/v1beta2/types.go
Generated Vendored
+2 -1
View File
@@ -331,7 +331,8 @@ type DeploymentSpec struct {
// The deployment strategy to use to replace existing pods with new ones.
// +optional
Strategy DeploymentStrategy `json:"strategy,omitempty" protobuf:"bytes,4,opt,name=strategy"`
// +patchStrategy=retainKeys
Strategy DeploymentStrategy `json:"strategy,omitempty" patchStrategy:"retainKeys" protobuf:"bytes,4,opt,name=strategy"`
// Minimum number of seconds for which a newly created pod should be ready
// without any of its container crashing, for it to be considered available.