github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Increase default value of DeploymentSpec.RevisionHistoryLimit to 10

Browse Source
This commit is contained in:
Di Xu 2017-08-01 10:53:23 +08:00
parent 1bc56825a2
commit 7b45e5344b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/apps/v1beta2/defaults.go
View File

@ -102,7 +102,7 @@ func SetDefaults_StatefulSet(obj *appsv1beta2.StatefulSet) {
// in extensions. These addons are: // in extensions. These addons are:
// - MaxUnavailable during rolling update set to 25% (1 in extensions) // - MaxUnavailable during rolling update set to 25% (1 in extensions)
// - MaxSurge value during rolling update set to 25% (1 in extensions) // - MaxSurge value during rolling update set to 25% (1 in extensions)
// - RevisionHistoryLimit set to 2 (not set in extensions) // - RevisionHistoryLimit set to 10 (not set in extensions)
// - ProgressDeadlineSeconds set to 600s (not set in extensions) // - ProgressDeadlineSeconds set to 600s (not set in extensions)
func SetDefaults_Deployment(obj *appsv1beta2.Deployment) { func SetDefaults_Deployment(obj *appsv1beta2.Deployment) {
// Default labels and selector to labels from pod template spec. // Default labels and selector to labels from pod template spec.
@ -144,7 +144,7 @@ func SetDefaults_Deployment(obj *appsv1beta2.Deployment) {
} }
if obj.Spec.RevisionHistoryLimit == nil { if obj.Spec.RevisionHistoryLimit == nil {
obj.Spec.RevisionHistoryLimit = new(int32) obj.Spec.RevisionHistoryLimit = new(int32)
*obj.Spec.RevisionHistoryLimit = 2 *obj.Spec.RevisionHistoryLimit = 10
} }
if obj.Spec.ProgressDeadlineSeconds == nil { if obj.Spec.ProgressDeadlineSeconds == nil {
obj.Spec.ProgressDeadlineSeconds = new(int32) obj.Spec.ProgressDeadlineSeconds = new(int32)

6
pkg/apis/apps/v1beta2/defaults_test.go
View File

@ -186,7 +186,7 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: newInt32(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: newInt32(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
@ -213,7 +213,7 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: newInt32(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: newInt32(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
@ -239,7 +239,7 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: newInt32(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: newInt32(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },

2
staging/src/k8s.io/api/apps/v1beta2/types.go
View File

@ -307,7 +307,7 @@ type DeploymentSpec struct {
// The number of old ReplicaSets to retain to allow rollback. // The number of old ReplicaSets to retain to allow rollback.
// This is a pointer to distinguish between explicit zero and not specified. // This is a pointer to distinguish between explicit zero and not specified.
// Defaults to 2. // Defaults to 10.
// +optional // +optional
RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty" protobuf:"varint,6,opt,name=revisionHistoryLimit"` RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty" protobuf:"varint,6,opt,name=revisionHistoryLimit"`