Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e6a8b295
Commit
e6a8b295
authored
Oct 30, 2018
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix retainKeys patchStrategy in apps/deployments
parent
650357ae
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
3 deletions
+12
-3
swagger.json
api/openapi-spec/swagger.json
+3
-0
generated.proto
staging/src/k8s.io/api/apps/v1/generated.proto
+1
-0
types.go
staging/src/k8s.io/api/apps/v1/types.go
+2
-1
generated.proto
staging/src/k8s.io/api/apps/v1beta1/generated.proto
+1
-0
types.go
staging/src/k8s.io/api/apps/v1beta1/types.go
+2
-1
generated.proto
staging/src/k8s.io/api/apps/v1beta2/generated.proto
+1
-0
types.go
staging/src/k8s.io/api/apps/v1beta2/types.go
+2
-1
No files found.
api/openapi-spec/swagger.json
View file @
e6a8b295
...
@@ -77796,6 +77796,7 @@
...
@@ -77796,6 +77796,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.apps.v1.DeploymentStrategy"
"$ref"
:
"#/definitions/io.k8s.api.apps.v1.DeploymentStrategy"
},
},
"template"
:
{
"template"
:
{
...
@@ -78516,6 +78517,7 @@
...
@@ -78516,6 +78517,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.apps.v1beta1.DeploymentStrategy"
"$ref"
:
"#/definitions/io.k8s.api.apps.v1beta1.DeploymentStrategy"
},
},
"template"
:
{
"template"
:
{
...
@@ -79301,6 +79303,7 @@
...
@@ -79301,6 +79303,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.apps.v1beta2.DeploymentStrategy"
"$ref"
:
"#/definitions/io.k8s.api.apps.v1beta2.DeploymentStrategy"
},
},
"template"
:
{
"template"
:
{
staging/src/k8s.io/api/apps/v1/generated.proto
View file @
e6a8b295
...
@@ -280,6 +280,7 @@ message DeploymentSpec {
...
@@ -280,6 +280,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
...
...
staging/src/k8s.io/api/apps/v1/types.go
View file @
e6a8b295
...
@@ -279,7 +279,8 @@ type DeploymentSpec struct {
...
@@ -279,7 +279,8 @@ type DeploymentSpec struct {
// 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
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
// 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.
// without any of its container crashing, for it to be considered available.
...
...
staging/src/k8s.io/api/apps/v1beta1/generated.proto
View file @
e6a8b295
...
@@ -143,6 +143,7 @@ message DeploymentSpec {
...
@@ -143,6 +143,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
...
...
staging/src/k8s.io/api/apps/v1beta1/types.go
View file @
e6a8b295
...
@@ -323,7 +323,8 @@ type DeploymentSpec struct {
...
@@ -323,7 +323,8 @@ type DeploymentSpec struct {
// 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
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
// 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.
// without any of its container crashing, for it to be considered available.
...
...
staging/src/k8s.io/api/apps/v1beta2/generated.proto
View file @
e6a8b295
...
@@ -286,6 +286,7 @@ message DeploymentSpec {
...
@@ -286,6 +286,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
...
...
staging/src/k8s.io/api/apps/v1beta2/types.go
View file @
e6a8b295
...
@@ -331,7 +331,8 @@ type DeploymentSpec struct {
...
@@ -331,7 +331,8 @@ type DeploymentSpec struct {
// 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
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
// 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.
// without any of its container crashing, for it to be considered available.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment