Rename PetSet API to StatefulSet

pkg/apis/apps/validation/validation.go

@@ -28,24 +28,24 @@ import (
 	"k8s.io/kubernetes/pkg/util/validation/field"
 )
 
-// ValidatePetSetName can be used to check whether the given PetSet name is valid.
+// ValidateStatefulSetName can be used to check whether the given StatefulSet name is valid.
 // Prefix indicates this name will be used as part of generation, in which case
 // trailing dashes are allowed.
-func ValidatePetSetName(name string, prefix bool) []string {
-	// TODO: Validate that there's name for the suffix inserted by the pets.
+func ValidateStatefulSetName(name string, prefix bool) []string {
+	// TODO: Validate that there's name for the suffix inserted by the pods.
 	// Currently this is just "-index". In the future we may allow a user
 	// specified list of suffixes and we need  to validate the longest one.
 	return apivalidation.NameIsDNSSubdomain(name, prefix)
 }
 
 // Validates the given template and ensures that it is in accordance with the desired selector.
-func ValidatePodTemplateSpecForPetSet(template *api.PodTemplateSpec, selector labels.Selector, fldPath *field.Path) field.ErrorList {
+func ValidatePodTemplateSpecForStatefulSet(template *api.PodTemplateSpec, selector labels.Selector, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 	if template == nil {
 		allErrs = append(allErrs, field.Required(fldPath, ""))
 	} else {
 		if !selector.Empty() {
-			// Verify that the PetSet selector matches the labels in template.
+			// Verify that the StatefulSet selector matches the labels in template.
 			labels := labels.Set(template.Labels)
 			if !selector.Matches(labels) {
 				allErrs = append(allErrs, field.Invalid(fldPath.Child("metadata", "labels"), template.Labels, "`selector` does not match template `labels`"))
@@ -62,8 +62,8 @@ func ValidatePodTemplateSpecForPetSet(template *api.PodTemplateSpec, selector la
 	return allErrs
 }
 
-// ValidatePetSetSpec tests if required fields in the PetSet spec are set.
-func ValidatePetSetSpec(spec *apps.PetSetSpec, fldPath *field.Path) field.ErrorList {
+// ValidateStatefulSetSpec tests if required fields in the StatefulSet spec are set.
+func ValidateStatefulSetSpec(spec *apps.StatefulSetSpec, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
 	allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(spec.Replicas), fldPath.Child("replicas"))...)
@@ -72,7 +72,7 @@ func ValidatePetSetSpec(spec *apps.PetSetSpec, fldPath *field.Path) field.ErrorL
 	} else {
 		allErrs = append(allErrs, unversionedvalidation.ValidateLabelSelector(spec.Selector, fldPath.Child("selector"))...)
 		if len(spec.Selector.MatchLabels)+len(spec.Selector.MatchExpressions) == 0 {
-			allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "empty selector is not valid for petset."))
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "empty selector is not valid for statefulset."))
 		}
 	}
 
@@ -80,7 +80,7 @@ func ValidatePetSetSpec(spec *apps.PetSetSpec, fldPath *field.Path) field.ErrorL
 	if err != nil {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, ""))
 	} else {
-		allErrs = append(allErrs, ValidatePodTemplateSpecForPetSet(&spec.Template, selector, fldPath.Child("template"))...)
+		allErrs = append(allErrs, ValidatePodTemplateSpecForStatefulSet(&spec.Template, selector, fldPath.Child("template"))...)
 	}
 
 	if spec.Template.Spec.RestartPolicy != api.RestartPolicyAlways {
@@ -90,42 +90,42 @@ func ValidatePetSetSpec(spec *apps.PetSetSpec, fldPath *field.Path) field.ErrorL
 	return allErrs
 }
 
-// ValidatePetSet validates a PetSet.
-func ValidatePetSet(petSet *apps.PetSet) field.ErrorList {
-	allErrs := apivalidation.ValidateObjectMeta(&petSet.ObjectMeta, true, ValidatePetSetName, field.NewPath("metadata"))
-	allErrs = append(allErrs, ValidatePetSetSpec(&petSet.Spec, field.NewPath("spec"))...)
+// ValidateStatefulSet validates a StatefulSet.
+func ValidateStatefulSet(statefulSet *apps.StatefulSet) field.ErrorList {
+	allErrs := apivalidation.ValidateObjectMeta(&statefulSet.ObjectMeta, true, ValidateStatefulSetName, field.NewPath("metadata"))
+	allErrs = append(allErrs, ValidateStatefulSetSpec(&statefulSet.Spec, field.NewPath("spec"))...)
 	return allErrs
 }
 
-// ValidatePetSetUpdate tests if required fields in the PetSet are set.
-func ValidatePetSetUpdate(petSet, oldPetSet *apps.PetSet) field.ErrorList {
-	allErrs := apivalidation.ValidateObjectMetaUpdate(&petSet.ObjectMeta, &oldPetSet.ObjectMeta, field.NewPath("metadata"))
+// ValidateStatefulSetUpdate tests if required fields in the StatefulSet are set.
+func ValidateStatefulSetUpdate(statefulSet, oldStatefulSet *apps.StatefulSet) field.ErrorList {
+	allErrs := apivalidation.ValidateObjectMetaUpdate(&statefulSet.ObjectMeta, &oldStatefulSet.ObjectMeta, field.NewPath("metadata"))
 
 	// TODO: For now we're taking the safe route and disallowing all updates to
 	// spec except for Replicas, for scaling, and Template.Spec.containers.image
 	// for rolling-update. Enable others on a case by case basis.
-	restoreReplicas := petSet.Spec.Replicas
-	petSet.Spec.Replicas = oldPetSet.Spec.Replicas
+	restoreReplicas := statefulSet.Spec.Replicas
+	statefulSet.Spec.Replicas = oldStatefulSet.Spec.Replicas
 
-	restoreContainers := petSet.Spec.Template.Spec.Containers
-	petSet.Spec.Template.Spec.Containers = oldPetSet.Spec.Template.Spec.Containers
+	restoreContainers := statefulSet.Spec.Template.Spec.Containers
+	statefulSet.Spec.Template.Spec.Containers = oldStatefulSet.Spec.Template.Spec.Containers
 
-	if !reflect.DeepEqual(petSet.Spec, oldPetSet.Spec) {
-		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to petset spec for fields other than 'replicas' are forbidden."))
+	if !reflect.DeepEqual(statefulSet.Spec, oldStatefulSet.Spec) {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to statefulset spec for fields other than 'replicas' are forbidden."))
 	}
-	petSet.Spec.Replicas = restoreReplicas
-	petSet.Spec.Template.Spec.Containers = restoreContainers
+	statefulSet.Spec.Replicas = restoreReplicas
+	statefulSet.Spec.Template.Spec.Containers = restoreContainers
 
-	allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(petSet.Spec.Replicas), field.NewPath("spec", "replicas"))...)
-	containerErrs, _ := apivalidation.ValidateContainerUpdates(petSet.Spec.Template.Spec.Containers, oldPetSet.Spec.Template.Spec.Containers, field.NewPath("spec").Child("template").Child("containers"))
+	allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(statefulSet.Spec.Replicas), field.NewPath("spec", "replicas"))...)
+	containerErrs, _ := apivalidation.ValidateContainerUpdates(statefulSet.Spec.Template.Spec.Containers, oldStatefulSet.Spec.Template.Spec.Containers, field.NewPath("spec").Child("template").Child("containers"))
 	allErrs = append(allErrs, containerErrs...)
 	return allErrs
 }
 
-// ValidatePetSetStatusUpdate tests if required fields in the PetSet are set.
-func ValidatePetSetStatusUpdate(petSet, oldPetSet *apps.PetSet) field.ErrorList {
+// ValidateStatefulSetStatusUpdate tests if required fields in the StatefulSet are set.
+func ValidateStatefulSetStatusUpdate(statefulSet, oldStatefulSet *apps.StatefulSet) field.ErrorList {
 	allErrs := field.ErrorList{}
-	allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&petSet.ObjectMeta, &oldPetSet.ObjectMeta, field.NewPath("metadata"))...)
+	allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&statefulSet.ObjectMeta, &oldStatefulSet.ObjectMeta, field.NewPath("metadata"))...)
 	// TODO: Validate status.
 	return allErrs
 }

pkg/apis/apps/validation/validation_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kubernetes/pkg/apis/apps"
 )
 
-func TestValidatePetSet(t *testing.T) {
+func TestValidateStatefulSet(t *testing.T) {
 	validLabels := map[string]string{"a": "b"}
 	validPodTemplate := api.PodTemplate{
 		Template: api.PodTemplateSpec{
@@ -51,65 +51,65 @@ func TestValidatePetSet(t *testing.T) {
 			},
 		},
 	}
-	successCases := []apps.PetSet{
+	successCases := []apps.StatefulSet{
 		{
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
 		},
 		{
 			ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
 		},
 	}
 	for _, successCase := range successCases {
-		if errs := ValidatePetSet(&successCase); len(errs) != 0 {
+		if errs := ValidateStatefulSet(&successCase); len(errs) != 0 {
 			t.Errorf("expected success: %v", errs)
 		}
 	}
 
-	errorCases := map[string]apps.PetSet{
+	errorCases := map[string]apps.StatefulSet{
 		"zero-length ID": {
 			ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
 		},
 		"missing-namespace": {
 			ObjectMeta: api.ObjectMeta{Name: "abc-123"},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
 		},
 		"empty selector": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Template: validPodTemplate.Template,
 			},
 		},
 		"selector_doesnt_match": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
 				Template: validPodTemplate.Template,
 			},
 		},
 		"invalid manifest": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 			},
 		},
 		"negative_replicas": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Replicas: -1,
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 			},
@@ -122,7 +122,7 @@ func TestValidatePetSet(t *testing.T) {
 					"NoUppercaseOrSpecialCharsLike=Equals": "bar",
 				},
 			},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
@@ -135,7 +135,7 @@ func TestValidatePetSet(t *testing.T) {
 					"NoUppercaseOrSpecialCharsLike=Equals": "bar",
 				},
 			},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Template: invalidPodTemplate.Template,
 			},
 		},
@@ -147,7 +147,7 @@ func TestValidatePetSet(t *testing.T) {
 					"NoUppercaseOrSpecialCharsLike=Equals": "bar",
 				},
 			},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: validPodTemplate.Template,
 			},
@@ -157,7 +157,7 @@ func TestValidatePetSet(t *testing.T) {
 				Name:      "abc-123",
 				Namespace: api.NamespaceDefault,
 			},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: api.PodTemplateSpec{
 					Spec: api.PodSpec{
@@ -176,7 +176,7 @@ func TestValidatePetSet(t *testing.T) {
 				Name:      "abc-123",
 				Namespace: api.NamespaceDefault,
 			},
-			Spec: apps.PetSetSpec{
+			Spec: apps.StatefulSetSpec{
 				Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 				Template: api.PodTemplateSpec{
 					Spec: api.PodSpec{
@@ -192,7 +192,7 @@ func TestValidatePetSet(t *testing.T) {
 		},
 	}
 	for k, v := range errorCases {
-		errs := ValidatePetSet(&v)
+		errs := ValidateStatefulSet(&v)
 		if len(errs) == 0 {
 			t.Errorf("expected failure for %s", k)
 		}
@@ -215,7 +215,7 @@ func TestValidatePetSet(t *testing.T) {
 	}
 }
 
-func TestValidatePetSetUpdate(t *testing.T) {
+func TestValidateStatefulSetUpdate(t *testing.T) {
 	validLabels := map[string]string{"a": "b"}
 	validPodTemplate := api.PodTemplate{
 		Template: api.PodTemplateSpec{
@@ -255,21 +255,21 @@ func TestValidatePetSetUpdate(t *testing.T) {
 		},
 	}
 	type psUpdateTest struct {
-		old    apps.PetSet
-		update apps.PetSet
+		old    apps.StatefulSet
+		update apps.StatefulSet
 	}
 	successCases := []psUpdateTest{
 		{
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: 3,
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
@@ -280,22 +280,22 @@ func TestValidatePetSetUpdate(t *testing.T) {
 	for _, successCase := range successCases {
 		successCase.old.ObjectMeta.ResourceVersion = "1"
 		successCase.update.ObjectMeta.ResourceVersion = "1"
-		if errs := ValidatePetSetUpdate(&successCase.update, &successCase.old); len(errs) != 0 {
+		if errs := ValidateStatefulSetUpdate(&successCase.update, &successCase.old); len(errs) != 0 {
 			t.Errorf("expected success: %v", errs)
 		}
 	}
 	errorCases := map[string]psUpdateTest{
 		"more than one read/write": {
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: 2,
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: readWriteVolumePodTemplate.Template,
@@ -303,16 +303,16 @@ func TestValidatePetSetUpdate(t *testing.T) {
 			},
 		},
 		"updates to a field other than spec.Replicas": {
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: 1,
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: readWriteVolumePodTemplate.Template,
@@ -320,16 +320,16 @@ func TestValidatePetSetUpdate(t *testing.T) {
 			},
 		},
 		"invalid selector": {
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: 2,
 					Selector: &unversioned.LabelSelector{MatchLabels: invalidLabels},
 					Template: validPodTemplate.Template,
@@ -337,16 +337,16 @@ func TestValidatePetSetUpdate(t *testing.T) {
 			},
 		},
 		"invalid pod": {
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: 2,
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: invalidPodTemplate.Template,
@@ -354,16 +354,16 @@ func TestValidatePetSetUpdate(t *testing.T) {
 			},
 		},
 		"negative replicas": {
-			old: apps.PetSet{
+			old: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
 				},
 			},
-			update: apps.PetSet{
+			update: apps.StatefulSet{
 				ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
-				Spec: apps.PetSetSpec{
+				Spec: apps.StatefulSetSpec{
 					Replicas: -1,
 					Selector: &unversioned.LabelSelector{MatchLabels: validLabels},
 					Template: validPodTemplate.Template,
@@ -372,7 +372,7 @@ func TestValidatePetSetUpdate(t *testing.T) {
 		},
 	}
 	for testName, errorCase := range errorCases {
-		if errs := ValidatePetSetUpdate(&errorCase.update, &errorCase.old); len(errs) == 0 {
+		if errs := ValidateStatefulSetUpdate(&errorCase.update, &errorCase.old); len(errs) == 0 {
 			t.Errorf("expected failure: %s", testName)
 		}
 	}