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
b5b1b586
Commit
b5b1b586
authored
Mar 27, 2018
by
fisherxu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RC to RS
parent
76ffe9e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
24 deletions
+24
-24
types.go
staging/src/k8s.io/api/apps/v1/types.go
+8
-8
types.go
staging/src/k8s.io/api/apps/v1beta1/types.go
+8
-8
types.go
staging/src/k8s.io/api/apps/v1beta2/types.go
+8
-8
No files found.
staging/src/k8s.io/api/apps/v1/types.go
View file @
b5b1b586
...
...
@@ -307,8 +307,8 @@ type DeploymentSpec struct {
const
(
// DefaultDeploymentUniqueLabelKey is the default key of the selector that is added
// to existing R
Cs (and label key that is added to its pods) to prevent the existing RC
s
// to select new pods (and old pods being select by new R
C
).
// to existing R
eplicaSets (and label key that is added to its pods) to prevent the existing ReplicaSet
s
// to select new pods (and old pods being select by new R
eplicaSet
).
DefaultDeploymentUniqueLabelKey
string
=
"pod-template-hash"
)
...
...
@@ -333,7 +333,7 @@ const (
// Kill all existing pods before creating new ones.
RecreateDeploymentStrategyType
DeploymentStrategyType
=
"Recreate"
// Replace the old R
Cs by new one using rolling update i.e gradually scale down the old RC
s and scale up the new one.
// Replace the old R
eplicaSets by new one using rolling update i.e gradually scale down the old ReplicaSet
s and scale up the new one.
RollingUpdateDeploymentStrategyType
DeploymentStrategyType
=
"RollingUpdate"
)
...
...
@@ -344,9 +344,9 @@ type RollingUpdateDeployment struct {
// Absolute number is calculated from percentage by rounding down.
// This can not be 0 if MaxSurge is 0.
// Defaults to 25%.
// Example: when this is set to 30%, the old R
C
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
C
// can be scaled down further, followed by scaling up the new R
C
, ensuring
// Example: when this is set to 30%, the old R
eplicaSet
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
eplicaSet
// can be scaled down further, followed by scaling up the new R
eplicaSet
, ensuring
// that the total number of pods available at all times during the update is at
// least 70% of desired pods.
// +optional
...
...
@@ -358,10 +358,10 @@ type RollingUpdateDeployment struct {
// This can not be 0 if MaxUnavailable is 0.
// Absolute number is calculated from percentage by rounding up.
// Defaults to 25%.
// Example: when this is set to 30%, the new R
C
can be scaled up immediately when
// Example: when this is set to 30%, the new R
eplicaSet
can be scaled up immediately when
// the rolling update starts, such that the total number of old and new pods do not exceed
// 130% of desired pods. Once old pods have been killed,
// new R
C
can be scaled up further, ensuring that total number of pods running
// new R
eplicaSet
can be scaled up further, ensuring that total number of pods running
// at any time during the update is at most 130% of desired pods.
// +optional
MaxSurge
*
intstr
.
IntOrString
`json:"maxSurge,omitempty" protobuf:"bytes,2,opt,name=maxSurge"`
...
...
staging/src/k8s.io/api/apps/v1beta1/types.go
View file @
b5b1b586
...
...
@@ -379,8 +379,8 @@ type RollbackConfig struct {
const
(
// DefaultDeploymentUniqueLabelKey is the default key of the selector that is added
// to existing R
Cs (and label key that is added to its pods) to prevent the existing RC
s
// to select new pods (and old pods being select by new R
C
).
// to existing R
eplicaSets (and label key that is added to its pods) to prevent the existing ReplicaSet
s
// to select new pods (and old pods being select by new R
eplicaSet
).
DefaultDeploymentUniqueLabelKey
string
=
"pod-template-hash"
)
...
...
@@ -405,7 +405,7 @@ const (
// Kill all existing pods before creating new ones.
RecreateDeploymentStrategyType
DeploymentStrategyType
=
"Recreate"
// Replace the old R
Cs by new one using rolling update i.e gradually scale down the old RC
s and scale up the new one.
// Replace the old R
eplicaSets by new one using rolling update i.e gradually scale down the old ReplicaSet
s and scale up the new one.
RollingUpdateDeploymentStrategyType
DeploymentStrategyType
=
"RollingUpdate"
)
...
...
@@ -416,9 +416,9 @@ type RollingUpdateDeployment struct {
// Absolute number is calculated from percentage by rounding down.
// This can not be 0 if MaxSurge is 0.
// Defaults to 25%.
// Example: when this is set to 30%, the old R
C
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
C
// can be scaled down further, followed by scaling up the new R
C
, ensuring
// Example: when this is set to 30%, the old R
eplicaSet
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
eplicaSet
// can be scaled down further, followed by scaling up the new R
eplicaSet
, ensuring
// that the total number of pods available at all times during the update is at
// least 70% of desired pods.
// +optional
...
...
@@ -430,10 +430,10 @@ type RollingUpdateDeployment struct {
// This can not be 0 if MaxUnavailable is 0.
// Absolute number is calculated from percentage by rounding up.
// Defaults to 25%.
// Example: when this is set to 30%, the new R
C
can be scaled up immediately when
// Example: when this is set to 30%, the new R
eplicaSet
can be scaled up immediately when
// the rolling update starts, such that the total number of old and new pods do not exceed
// 130% of desired pods. Once old pods have been killed,
// new R
C
can be scaled up further, ensuring that total number of pods running
// new R
eplicaSet
can be scaled up further, ensuring that total number of pods running
// at any time during the update is atmost 130% of desired pods.
// +optional
MaxSurge
*
intstr
.
IntOrString
`json:"maxSurge,omitempty" protobuf:"bytes,2,opt,name=maxSurge"`
...
...
staging/src/k8s.io/api/apps/v1beta2/types.go
View file @
b5b1b586
...
...
@@ -359,8 +359,8 @@ type DeploymentSpec struct {
const
(
// DefaultDeploymentUniqueLabelKey is the default key of the selector that is added
// to existing R
Cs (and label key that is added to its pods) to prevent the existing RC
s
// to select new pods (and old pods being select by new R
C
).
// to existing R
eplicaSets (and label key that is added to its pods) to prevent the existing ReplicaSet
s
// to select new pods (and old pods being select by new R
eplicaSet
).
DefaultDeploymentUniqueLabelKey
string
=
"pod-template-hash"
)
...
...
@@ -385,7 +385,7 @@ const (
// Kill all existing pods before creating new ones.
RecreateDeploymentStrategyType
DeploymentStrategyType
=
"Recreate"
// Replace the old R
Cs by new one using rolling update i.e gradually scale down the old RC
s and scale up the new one.
// Replace the old R
eplicaSets by new one using rolling update i.e gradually scale down the old ReplicaSet
s and scale up the new one.
RollingUpdateDeploymentStrategyType
DeploymentStrategyType
=
"RollingUpdate"
)
...
...
@@ -396,9 +396,9 @@ type RollingUpdateDeployment struct {
// Absolute number is calculated from percentage by rounding down.
// This can not be 0 if MaxSurge is 0.
// Defaults to 25%.
// Example: when this is set to 30%, the old R
C
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
C
// can be scaled down further, followed by scaling up the new R
C
, ensuring
// Example: when this is set to 30%, the old R
eplicaSet
can be scaled down to 70% of desired pods
// immediately when the rolling update starts. Once new pods are ready, old R
eplicaSet
// can be scaled down further, followed by scaling up the new R
eplicaSet
, ensuring
// that the total number of pods available at all times during the update is at
// least 70% of desired pods.
// +optional
...
...
@@ -410,10 +410,10 @@ type RollingUpdateDeployment struct {
// This can not be 0 if MaxUnavailable is 0.
// Absolute number is calculated from percentage by rounding up.
// Defaults to 25%.
// Example: when this is set to 30%, the new R
C
can be scaled up immediately when
// Example: when this is set to 30%, the new R
eplicaSet
can be scaled up immediately when
// the rolling update starts, such that the total number of old and new pods do not exceed
// 130% of desired pods. Once old pods have been killed,
// new R
C
can be scaled up further, ensuring that total number of pods running
// new R
eplicaSet
can be scaled up further, ensuring that total number of pods running
// at any time during the update is atmost 130% of desired pods.
// +optional
MaxSurge
*
intstr
.
IntOrString
`json:"maxSurge,omitempty" protobuf:"bytes,2,opt,name=maxSurge"`
...
...
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