Comment out DaemonSet update type fields and remove the code that depends on it.

Leaving the type fields as comments for reference and reminder. But deleting the conversion, defaulting and validation code. They can always be brough back from the previous PR once the types are introduced. Because builds break without them anyway that serves as a reminder, so there is no need to leave them commented out.
2026-01-05 23:47:50 +00:00 · 2016-02-03 14:05:04 -08:00
parent c70c7fde4d
commit ad9ba23995
14 changed files with 11899 additions and 13567 deletions
--- a/pkg/apis/extensions/validation/validation.go
+++ b/pkg/apis/extensions/validation/validation.go
@@ -207,34 +207,6 @@ func ValidateDaemonSetTemplateUpdate(podTemplate, oldPodTemplate api.PodTemplate
 	return allErrs
 }

-func ValidateRollingUpdateDaemonSet(rollingUpdate *extensions.RollingUpdateDaemonSet, fldPath *field.Path) field.ErrorList {
-	allErrs := field.ErrorList{}
-	allErrs = append(allErrs, ValidatePositiveIntOrPercent(rollingUpdate.MaxUnavailable, fldPath.Child("maxUnavailable"))...)
-	if getIntOrPercentValue(rollingUpdate.MaxUnavailable) == 0 {
-		// MaxUnavailable cannot be 0.
-		allErrs = append(allErrs, field.Invalid(fldPath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable, "cannot be 0"))
-	}
-	// Validate that MaxUnavailable is not more than 100%.
-	allErrs = append(allErrs, IsNotMoreThan100Percent(rollingUpdate.MaxUnavailable, fldPath.Child("maxUnavailable"))...)
-	allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(rollingUpdate.MinReadySeconds), fldPath.Child("minReadySeconds"))...)
-	return allErrs
-}
-
-func ValidateDaemonSetUpdateStrategy(strategy *extensions.DaemonSetUpdateStrategy, fldPath *field.Path) field.ErrorList {
-	allErrs := field.ErrorList{}
-	// Only rolling update is supported at this time.
-	if strategy.Type != extensions.RollingUpdateDaemonSetStrategyType {
-		allErrs = append(allErrs, field.Invalid(fldPath.Child("type"), strategy.Type, "RollingUpdate is the only supported type"))
-	}
-	// Make sure RollingUpdate field isn't nil.
-	if strategy.RollingUpdate == nil {
-		allErrs = append(allErrs, field.Required(fldPath.Child("rollingUpdate"), ""))
-		return allErrs
-	}
-	allErrs = append(allErrs, ValidateRollingUpdateDaemonSet(strategy.RollingUpdate, fldPath.Child("rollingUpdate"))...)
-	return allErrs
-}
-
 // ValidateDaemonSetSpec tests if required fields in the DaemonSetSpec are set.
 func ValidateDaemonSetSpec(spec *extensions.DaemonSetSpec, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
@@ -253,9 +225,6 @@ func ValidateDaemonSetSpec(spec *extensions.DaemonSetSpec, fldPath *field.Path)
 	if spec.Template.Spec.RestartPolicy != api.RestartPolicyAlways {
 		allErrs = append(allErrs, field.NotSupported(fldPath.Child("template", "spec", "restartPolicy"), spec.Template.Spec.RestartPolicy, []string{string(api.RestartPolicyAlways)}))
 	}
-
-	allErrs = append(allErrs, ValidateDaemonSetUpdateStrategy(&spec.UpdateStrategy, fldPath.Child("updateStrategy"))...)
-
 	return allErrs
 }

--- a/pkg/apis/extensions/validation/validation_test.go
+++ b/pkg/apis/extensions/validation/validation_test.go
@@ -387,13 +387,6 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 	validSelector2 := map[string]string{"c": "d"}
 	invalidSelector := map[string]string{"NoUppercaseOrSpecialCharsLike=Equals": "b"}

-	validUpdateStrategy := extensions.DaemonSetUpdateStrategy{
-		Type: extensions.RollingUpdateDaemonSetStrategyType,
-		RollingUpdate: &extensions.RollingUpdateDaemonSet{
-			MaxUnavailable: intstr.FromInt(1),
-		},
-	}
-
 	validPodSpecAbc := api.PodSpec{
 		RestartPolicy: api.RestartPolicyAlways,
 		DNSPolicy:     api.DNSClusterFirst,
@@ -479,17 +472,15 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 			old: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 			update: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 		},
@@ -497,17 +488,15 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 			old: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 			update: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector2},
-					Template:       validPodTemplateAbc2.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector2},
+					Template: validPodTemplateAbc2.Template,
 				},
 			},
 		},
@@ -515,17 +504,15 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 			old: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 			update: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateNodeSelector.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateNodeSelector.Template,
 				},
 			},
 		},
@@ -542,17 +529,15 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 			old: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 			update: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 		},
@@ -560,81 +545,72 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 			old: extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
 				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-			update: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: invalidSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-		},
-		"invalid pod": {
-			old: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-			update: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       invalidPodTemplate.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-		},
-		"change container image": {
-			old: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-			update: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateDef.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-		},
-		"read-write volume": {
-			old: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-			update: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       readWriteVolumePodTemplate.Template,
-					UpdateStrategy: validUpdateStrategy,
-				},
-			},
-		},
-		"invalid update strategy": {
-			old: extensions.DaemonSet{
-				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: extensions.DaemonSetSpec{
-					Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-					Template:       validPodTemplateAbc.Template,
-					UpdateStrategy: validUpdateStrategy,
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
+				},
+			},
+			update: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: invalidSelector},
+					Template: validPodTemplateAbc.Template,
+				},
+			},
+		},
+		"invalid pod": {
+			old: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
+				},
+			},
+			update: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: invalidPodTemplate.Template,
+				},
+			},
+		},
+		"change container image": {
+			old: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
+				},
+			},
+			update: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateDef.Template,
+				},
+			},
+		},
+		"read-write volume": {
+			old: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
+				},
+			},
+			update: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: readWriteVolumePodTemplate.Template,
+				},
+			},
+		},
+		"invalid update strategy": {
+			old: extensions.DaemonSet{
+				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
+				Spec: extensions.DaemonSetSpec{
+					Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+					Template: validPodTemplateAbc.Template,
 				},
 			},
 			update: extensions.DaemonSet{
@@ -642,10 +618,6 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 				Spec: extensions.DaemonSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: invalidSelector},
 					Template: validPodTemplateAbc.Template,
-					UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-						Type:          extensions.RollingUpdateDaemonSetStrategyType,
-						RollingUpdate: nil,
-					},
 				},
 			},
 		},
@@ -659,12 +631,6 @@ func TestValidateDaemonSetUpdate(t *testing.T) {

 func TestValidateDaemonSet(t *testing.T) {
 	validSelector := map[string]string{"a": "b"}
-	validUpdateStrategy := extensions.DaemonSetUpdateStrategy{
-		Type: extensions.RollingUpdateDaemonSetStrategyType,
-		RollingUpdate: &extensions.RollingUpdateDaemonSet{
-			MaxUnavailable: intstr.FromInt(1),
-		},
-	}
 	validPodTemplate := api.PodTemplate{
 		Template: api.PodTemplateSpec{
 			ObjectMeta: api.ObjectMeta{
@@ -693,17 +659,15 @@ func TestValidateDaemonSet(t *testing.T) {
 		{
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
 			Spec: extensions.DaemonSetSpec{
-				Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template:       validPodTemplate.Template,
-				UpdateStrategy: validUpdateStrategy,
+				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+				Template: validPodTemplate.Template,
 			},
 		},
 		{
 			ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault},
 			Spec: extensions.DaemonSetSpec{
-				Selector:       &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template:       validPodTemplate.Template,
-				UpdateStrategy: validUpdateStrategy,
+				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
+				Template: validPodTemplate.Template,
 			},
 		},
 	}
@@ -823,104 +787,6 @@ func TestValidateDaemonSet(t *testing.T) {
 				},
 			},
 		},
-		"invalid update strategy - Type is not RollingUpdate": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type: "",
-					RollingUpdate: &extensions.RollingUpdateDaemonSet{
-						MaxUnavailable: intstr.FromInt(1),
-					},
-				},
-			},
-		},
-		"invalid update strategy - RollingUpdate field is nil": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type:          extensions.RollingUpdateDaemonSetStrategyType,
-					RollingUpdate: nil,
-				},
-			},
-		},
-		"invalid update strategy - MaxUnavailable is 0": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type: extensions.RollingUpdateDaemonSetStrategyType,
-					RollingUpdate: &extensions.RollingUpdateDaemonSet{
-						MaxUnavailable:  intstr.FromInt(0),
-						MinReadySeconds: 1,
-					},
-				},
-			},
-		},
-		"invalid update strategy - MaxUnavailable is greater than 100%": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type: extensions.RollingUpdateDaemonSetStrategyType,
-					RollingUpdate: &extensions.RollingUpdateDaemonSet{
-						MaxUnavailable:  intstr.FromString("150%"),
-						MinReadySeconds: 1,
-					},
-				},
-			},
-		},
-		"invalid update strategy - MaxUnavailable is negative": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type: extensions.RollingUpdateDaemonSetStrategyType,
-					RollingUpdate: &extensions.RollingUpdateDaemonSet{
-						MaxUnavailable:  intstr.FromInt(-1),
-						MinReadySeconds: 0,
-					},
-				},
-			},
-		},
-		"invalid update strategy - MinReadySeconds is negative": {
-			ObjectMeta: api.ObjectMeta{
-				Name:      "abc-123",
-				Namespace: api.NamespaceDefault,
-			},
-			Spec: extensions.DaemonSetSpec{
-				Selector: &unversioned.LabelSelector{MatchLabels: validSelector},
-				Template: validPodTemplate.Template,
-				UpdateStrategy: extensions.DaemonSetUpdateStrategy{
-					Type: extensions.RollingUpdateDaemonSetStrategyType,
-					RollingUpdate: &extensions.RollingUpdateDaemonSet{
-						MaxUnavailable:  intstr.FromInt(-1),
-						MinReadySeconds: -1,
-					},
-				},
-			},
-		},
 	}
 	for k, v := range errorCases {
 		errs := ValidateDaemonSet(&v)