Convert RestartPolicy to string for v1beta3.

Fixed #3607 and spiritually support #5475

pkg/api/serialization_test.go

@@ -162,7 +162,7 @@ func TestEncode_Ptr(t *testing.T) {
 			Labels: map[string]string{"name": "foo"},
 		},
 		Spec: api.PodSpec{
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 	}

pkg/api/testing/fuzzer.go

@@ -161,8 +161,8 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 			*p = policies[c.Rand.Intn(len(policies))]
 		},
 		func(rp *api.RestartPolicy, c fuzz.Continue) {
-			// Exactly one of the fields should be set.
-			fuzzOneOf(c, &rp.Always, &rp.OnFailure, &rp.Never)
+			policies := []api.RestartPolicy{api.RestartPolicyAlways, api.RestartPolicyNever, api.RestartPolicyOnFailure}
+			*rp = policies[c.Rand.Intn(len(policies))]
 		},
 		func(vs *api.VolumeSource, c fuzz.Continue) {
 			// Exactly one of the fields should be set.

pkg/api/types.go

@@ -515,23 +515,17 @@ type PodContainerInfo struct {
 	ContainerInfo PodInfo `json:"containerInfo"`
 }
 
-type RestartPolicyAlways struct{}
-
-// TODO(dchen1107): Define what kinds of failures should restart.
-// TODO(dchen1107): Decide whether to support policy knobs, and, if so, which ones.
-type RestartPolicyOnFailure struct{}
-
-type RestartPolicyNever struct{}
-
 // RestartPolicy describes how the container should be restarted.
 // Only one of the following restart policies may be specified.
 // If none of the following policies is specified, the default one
 // is RestartPolicyAlways.
-type RestartPolicy struct {
-	Always    *RestartPolicyAlways    `json:"always,omitempty"`
-	OnFailure *RestartPolicyOnFailure `json:"onFailure,omitempty"`
-	Never     *RestartPolicyNever     `json:"never,omitempty"`
-}
+type RestartPolicy string
+
+const (
+	RestartPolicyAlways    RestartPolicy = "Always"
+	RestartPolicyOnFailure RestartPolicy = "OnFailure"
+	RestartPolicyNever     RestartPolicy = "Never"
+)
 
 // PodList is a list of Pods.
 type PodList struct {

pkg/api/v1beta1/conversion.go

@@ -1139,6 +1139,33 @@ func init() {
 			return nil
 		},
 
+		func(in *newer.RestartPolicy, out *RestartPolicy, s conversion.Scope) error {
+			switch *in {
+			case newer.RestartPolicyAlways:
+				*out = RestartPolicy{Always: &RestartPolicyAlways{}}
+			case newer.RestartPolicyNever:
+				*out = RestartPolicy{Never: &RestartPolicyNever{}}
+			case newer.RestartPolicyOnFailure:
+				*out = RestartPolicy{OnFailure: &RestartPolicyOnFailure{}}
+			default:
+				*out = RestartPolicy{}
+			}
+			return nil
+		},
+		func(in *RestartPolicy, out *newer.RestartPolicy, s conversion.Scope) error {
+			switch {
+			case in.Always != nil:
+				*out = newer.RestartPolicyAlways
+			case in.Never != nil:
+				*out = newer.RestartPolicyNever
+			case in.OnFailure != nil:
+				*out = newer.RestartPolicyOnFailure
+			default:
+				*out = ""
+			}
+			return nil
+		},
+
 		func(in *newer.Probe, out *LivenessProbe, s conversion.Scope) error {
 			if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil {
 				return err

pkg/api/v1beta2/conversion.go

@@ -1055,6 +1055,33 @@ func init() {
 			return nil
 		},
 
+		func(in *newer.RestartPolicy, out *RestartPolicy, s conversion.Scope) error {
+			switch *in {
+			case newer.RestartPolicyAlways:
+				*out = RestartPolicy{Always: &RestartPolicyAlways{}}
+			case newer.RestartPolicyNever:
+				*out = RestartPolicy{Never: &RestartPolicyNever{}}
+			case newer.RestartPolicyOnFailure:
+				*out = RestartPolicy{OnFailure: &RestartPolicyOnFailure{}}
+			default:
+				*out = RestartPolicy{}
+			}
+			return nil
+		},
+		func(in *RestartPolicy, out *newer.RestartPolicy, s conversion.Scope) error {
+			switch {
+			case in.Always != nil:
+				*out = newer.RestartPolicyAlways
+			case in.Never != nil:
+				*out = newer.RestartPolicyNever
+			case in.OnFailure != nil:
+				*out = newer.RestartPolicyOnFailure
+			default:
+				*out = ""
+			}
+			return nil
+		},
+
 		func(in *newer.Probe, out *LivenessProbe, s conversion.Scope) error {
 			if err := s.Convert(&in.Exec, &out.Exec, 0); err != nil {
 				return err

pkg/api/v1beta3/defaults.go

@@ -52,11 +52,6 @@ func init() {
 				obj.TerminationMessagePath = TerminationMessagePathDefault
 			}
 		},
-		func(obj *RestartPolicy) {
-			if util.AllPtrFieldsNil(obj) {
-				obj.Always = &RestartPolicyAlways{}
-			}
-		},
 		func(obj *Service) {
 			if obj.Spec.Protocol == "" {
 				obj.Spec.Protocol = ProtocolTCP
@@ -69,6 +64,9 @@ func init() {
 			if obj.DNSPolicy == "" {
 				obj.DNSPolicy = DNSClusterFirst
 			}
+			if obj.RestartPolicy == "" {
+				obj.RestartPolicy = RestartPolicyAlways
+			}
 		},
 		func(obj *Probe) {
 			if obj.TimeoutSeconds == 0 {

pkg/api/v1beta3/defaults_test.go

@@ -62,7 +62,7 @@ func TestSetDefaulPodSpec(t *testing.T) {
 		t.Errorf("Expected default dns policy :%s, got: %s", current.DNSClusterFirst, bp2.Spec.DNSPolicy)
 	}
 	policy := bp2.Spec.RestartPolicy
-	if policy.Never != nil || policy.OnFailure != nil || policy.Always == nil {
+	if policy != current.RestartPolicyAlways {
 		t.Errorf("Expected only policy.Always is set, got: %s", policy)
 	}
 	vsource := bp2.Spec.Volumes[0].VolumeSource

pkg/api/v1beta3/types.go

@@ -522,22 +522,17 @@ type PodCondition struct {
 // PodInfo contains one entry for every container with available info.
 type PodInfo map[string]ContainerStatus
 
-type RestartPolicyAlways struct{}
+// RestartPolicy describes how the container should be restarted.
+// Only one of the following restart policies may be specified.
+// If none of the following policies is specified, the default one
+// is RestartPolicyAlways.
+type RestartPolicy string
 
-// TODO(dchen1107): Define what kinds of failures should restart.
-// TODO(dchen1107): Decide whether to support policy knobs, and, if so, which ones.
-type RestartPolicyOnFailure struct{}
-
-type RestartPolicyNever struct{}
-
-type RestartPolicy struct {
-	// Only one of the following restart policies may be specified.
-	// If none of the following policies is specified, the default one
-	// is RestartPolicyAlways.
-	Always    *RestartPolicyAlways    `json:"always,omitempty" description:"always restart the container after termination"`
-	OnFailure *RestartPolicyOnFailure `json:"onFailure,omitempty" description:"restart the container if it fails for any reason, but not if it succeeds (exit 0)"`
-	Never     *RestartPolicyNever     `json:"never,omitempty" description:"never restart the container"`
-}
+const (
+	RestartPolicyAlways    RestartPolicy = "Always"
+	RestartPolicyOnFailure RestartPolicy = "OnFailure"
+	RestartPolicyNever     RestartPolicy = "Never"
+)
 
 // DNSPolicy defines how a pod's DNS will be configured.
 type DNSPolicy string

pkg/api/validation/validation.go

@@ -600,20 +600,16 @@ func ValidateManifest(manifest *api.ContainerManifest) errs.ValidationErrorList
 }
 
 func validateRestartPolicy(restartPolicy *api.RestartPolicy) errs.ValidationErrorList {
-	numPolicies := 0
 	allErrors := errs.ValidationErrorList{}
-	if restartPolicy.Always != nil {
-		numPolicies++
-	}
-	if restartPolicy.OnFailure != nil {
-		numPolicies++
-	}
-	if restartPolicy.Never != nil {
-		numPolicies++
-	}
-	if numPolicies != 1 {
-		allErrors = append(allErrors, errs.NewFieldInvalid("", restartPolicy, "only 1 policy is allowed"))
+	switch *restartPolicy {
+	case api.RestartPolicyAlways, api.RestartPolicyOnFailure, api.RestartPolicyNever:
+		break
+	case "":
+		allErrors = append(allErrors, errs.NewFieldRequired("", *restartPolicy))
+	default:
+		allErrors = append(allErrors, errs.NewFieldNotSupported("", restartPolicy))
 	}
+
 	return allErrors
 }
 
@@ -786,10 +782,8 @@ func ValidateReplicationControllerSpec(spec *api.ReplicationControllerSpec) errs
 		}
 		allErrs = append(allErrs, ValidatePodTemplateSpec(spec.Template, spec.Replicas).Prefix("template")...)
 		// RestartPolicy has already been first-order validated as per ValidatePodTemplateSpec().
-		if spec.Template.Spec.RestartPolicy.Always == nil {
-			// TODO: should probably be Unsupported
-			// TODO: api.RestartPolicy should have a String() method for nicer printing
-			allErrs = append(allErrs, errs.NewFieldInvalid("template.restartPolicy", spec.Template.Spec.RestartPolicy, "must be Always"))
+		if spec.Template.Spec.RestartPolicy != api.RestartPolicyAlways {
+			allErrs = append(allErrs, errs.NewFieldNotSupported("template.restartPolicy", spec.Template.Spec.RestartPolicy))
 		}
 	}
 	return allErrs

pkg/api/validation/validation_test.go

@@ -656,9 +656,9 @@ func TestValidateContainers(t *testing.T) {
 
 func TestValidateRestartPolicy(t *testing.T) {
 	successCases := []api.RestartPolicy{
-		{Always: &api.RestartPolicyAlways{}},
-		{OnFailure: &api.RestartPolicyOnFailure{}},
-		{Never: &api.RestartPolicyNever{}},
+		api.RestartPolicyAlways,
+		api.RestartPolicyOnFailure,
+		api.RestartPolicyNever,
 	}
 	for _, policy := range successCases {
 		if errs := validateRestartPolicy(&policy); len(errs) != 0 {
@@ -666,11 +666,8 @@ func TestValidateRestartPolicy(t *testing.T) {
 		}
 	}
 
-	errorCases := []api.RestartPolicy{
-		{},
-		{Always: &api.RestartPolicyAlways{}, Never: &api.RestartPolicyNever{}},
-		{Never: &api.RestartPolicyNever{}, OnFailure: &api.RestartPolicyOnFailure{}},
-	}
+	errorCases := []api.RestartPolicy{"", "newpolicy"}
+
 	for k, policy := range errorCases {
 		if errs := validateRestartPolicy(&policy); len(errs) == 0 {
 			t.Errorf("expected failure for %d", k)
@@ -694,94 +691,12 @@ func TestValidateDNSPolicy(t *testing.T) {
 	}
 }
 
-func TestValidateManifest(t *testing.T) {
-	successCases := []api.ContainerManifest{
-		{Version: "v1beta1", ID: "abc", RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy: api.DNSClusterFirst},
-		{Version: "v1beta2", ID: "123", RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy: api.DNSClusterFirst},
-		{Version: "V1BETA1", ID: "abc.123.do-re-mi",
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}}, DNSPolicy: api.DNSClusterFirst},
-		{
-			Version: "v1beta1",
-			ID:      "abc",
-			Volumes: []api.Volume{{Name: "vol1", VolumeSource: api.VolumeSource{HostPath: &api.HostPathVolumeSource{"/mnt/vol1"}}},
-				{Name: "vol2", VolumeSource: api.VolumeSource{HostPath: &api.HostPathVolumeSource{"/mnt/vol2"}}}},
-			Containers: []api.Container{
-				{
-					Name:       "abc",
-					Image:      "image",
-					Command:    []string{"foo", "bar"},
-					WorkingDir: "/tmp",
-					Resources: api.ResourceRequirements{
-						Limits: api.ResourceList{
-							"cpu":    resource.MustParse("1"),
-							"memory": resource.MustParse("1"),
-						},
-					},
-					Ports: []api.ContainerPort{
-						{Name: "p1", ContainerPort: 80, HostPort: 8080, Protocol: "TCP"},
-						{Name: "p2", ContainerPort: 81, Protocol: "TCP"},
-						{ContainerPort: 82, Protocol: "TCP"},
-					},
-					Env: []api.EnvVar{
-						{Name: "ev1", Value: "val1"},
-						{Name: "ev2", Value: "val2"},
-						{Name: "EV3", Value: "val3"},
-					},
-					VolumeMounts: []api.VolumeMount{
-						{Name: "vol1", MountPath: "/foo"},
-						{Name: "vol1", MountPath: "/bar"},
-					},
-					ImagePullPolicy: "IfNotPresent",
-				},
-			},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy:     api.DNSClusterFirst,
-		},
-	}
-	for _, manifest := range successCases {
-		if errs := ValidateManifest(&manifest); len(errs) != 0 {
-			t.Errorf("expected success: %v", errs)
-		}
-	}
-
-	errorCases := map[string]api.ContainerManifest{
-		"empty version": {Version: "", ID: "abc",
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy:     api.DNSClusterFirst},
-		"invalid version": {Version: "bogus", ID: "abc",
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy:     api.DNSClusterFirst},
-		"invalid volume name": {
-			Version:       "v1beta1",
-			ID:            "abc",
-			Volumes:       []api.Volume{{Name: "vol.1", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy:     api.DNSClusterFirst,
-		},
-		"invalid container name": {
-			Version: "v1beta1",
-			ID:      "abc",
-			Containers: []api.Container{{Name: "ctr.1", Image: "image", ImagePullPolicy: "IfNotPresent",
-				TerminationMessagePath: "/foo/bar"}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
-			DNSPolicy:     api.DNSClusterFirst,
-		},
-	}
-	for k, v := range errorCases {
-		if errs := ValidateManifest(&v); len(errs) == 0 {
-			t.Errorf("expected failure for %s", k)
-		}
-	}
-}
-
 func TestValidatePodSpec(t *testing.T) {
 	successCases := []api.PodSpec{
 		{ // Populate basic fields, leave defaults for most.
 			Volumes:       []api.Volume{{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}}},
 			Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 		{ // Populate all fields.
@@ -789,7 +704,7 @@ func TestValidatePodSpec(t *testing.T) {
 				{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}},
 			},
 			Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			NodeSelector: map[string]string{
 				"key": "value",
 			},
@@ -806,20 +721,20 @@ func TestValidatePodSpec(t *testing.T) {
 	failureCases := map[string]api.PodSpec{
 		"bad volume": {
 			Volumes:       []api.Volume{{}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 		"bad container": {
 			Containers:    []api.Container{{}},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 		"bad DNS policy": {
 			DNSPolicy:     api.DNSPolicy("invalid"),
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 		},
 		"bad restart policy": {
-			RestartPolicy: api.RestartPolicy{},
+			RestartPolicy: "UnknowPolicy",
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 	}
@@ -837,7 +752,7 @@ func TestValidatePod(t *testing.T) {
 			Spec: api.PodSpec{
 				Volumes:       []api.Volume{{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}}},
 				Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -848,7 +763,7 @@ func TestValidatePod(t *testing.T) {
 					{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}},
 				},
 				Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 				NodeSelector: map[string]string{
 					"key": "value",
@@ -867,14 +782,14 @@ func TestValidatePod(t *testing.T) {
 		"bad name": {
 			ObjectMeta: api.ObjectMeta{Name: "", Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
 		"bad namespace": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: ""},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -893,7 +808,7 @@ func TestValidatePod(t *testing.T) {
 				},
 			},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1117,7 +1032,7 @@ func TestValidateBoundPods(t *testing.T) {
 		{ // Mostly empty.
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1126,7 +1041,7 @@ func TestValidateBoundPods(t *testing.T) {
 			Spec: api.PodSpec{
 				Volumes:       []api.Volume{{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}}},
 				Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1137,7 +1052,7 @@ func TestValidateBoundPods(t *testing.T) {
 					{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}},
 				},
 				Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 				NodeSelector: map[string]string{
 					"key": "value",
@@ -1156,14 +1071,14 @@ func TestValidateBoundPods(t *testing.T) {
 		"zero-length name": {
 			ObjectMeta: api.ObjectMeta{Name: "", Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
 		"bad namespace": {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: ""},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1171,28 +1086,28 @@ func TestValidateBoundPods(t *testing.T) {
 			ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "ns"},
 			Spec: api.PodSpec{
 				Containers:    []api.Container{{Name: "name", ImagePullPolicy: "IfNotPresent"}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
 		"name > 253 characters": {
 			ObjectMeta: api.ObjectMeta{Name: strings.Repeat("a", 254), Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
 		"name not a DNS subdomain": {
 			ObjectMeta: api.ObjectMeta{Name: "a..b.c", Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
 		"name with underscore": {
 			ObjectMeta: api.ObjectMeta{Name: "a_b_c", Namespace: "ns"},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1391,7 +1306,7 @@ func TestValidateReplicationControllerUpdate(t *testing.T) {
 				Labels: validSelector,
 			},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1402,7 +1317,7 @@ func TestValidateReplicationControllerUpdate(t *testing.T) {
 				Labels: validSelector,
 			},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 				Volumes:       []api.Volume{{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{"my-PD", "ext4", 1, false}}}},
 			},
@@ -1412,7 +1327,7 @@ func TestValidateReplicationControllerUpdate(t *testing.T) {
 	invalidPodTemplate := api.PodTemplate{
 		Spec: api.PodTemplateSpec{
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 			ObjectMeta: api.ObjectMeta{
@@ -1551,7 +1466,7 @@ func TestValidateReplicationController(t *testing.T) {
 				Labels: validSelector,
 			},
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1563,7 +1478,7 @@ func TestValidateReplicationController(t *testing.T) {
 			},
 			Spec: api.PodSpec{
 				Volumes:       []api.Volume{{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{"my-PD", "ext4", 1, false}}}},
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 		},
@@ -1572,7 +1487,7 @@ func TestValidateReplicationController(t *testing.T) {
 	invalidPodTemplate := api.PodTemplate{
 		Spec: api.PodTemplateSpec{
 			Spec: api.PodSpec{
-				RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+				RestartPolicy: api.RestartPolicyAlways,
 				DNSPolicy:     api.DNSClusterFirst,
 			},
 			ObjectMeta: api.ObjectMeta{
@@ -1693,10 +1608,8 @@ func TestValidateReplicationController(t *testing.T) {
 				Selector: validSelector,
 				Template: &api.PodTemplateSpec{
 					Spec: api.PodSpec{
-						RestartPolicy: api.RestartPolicy{
-							OnFailure: &api.RestartPolicyOnFailure{},
-						},
-						DNSPolicy: api.DNSClusterFirst,
+						RestartPolicy: api.RestartPolicyOnFailure,
+						DNSPolicy:     api.DNSClusterFirst,
 					},
 					ObjectMeta: api.ObjectMeta{
 						Labels: validSelector,
@@ -1713,10 +1626,8 @@ func TestValidateReplicationController(t *testing.T) {
 				Selector: validSelector,
 				Template: &api.PodTemplateSpec{
 					Spec: api.PodSpec{
-						RestartPolicy: api.RestartPolicy{
-							Never: &api.RestartPolicyNever{},
-						},
-						DNSPolicy: api.DNSClusterFirst,
+						RestartPolicy: api.RestartPolicyNever,
+						DNSPolicy:     api.DNSClusterFirst,
 					},
 					ObjectMeta: api.ObjectMeta{
 						Labels: validSelector,