github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename PetSet API to StatefulSet

Browse Source
This commit is contained in:
Janet Kuo
2016-10-26 13:44:07 -07:00
parent a266f72b34
commit 10aee82ae3
57 changed files with 1675 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
pkg/apis/apps/validation/validation_test.go
View File

@@ -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)
}
}