Fix the rest of the code

pkg/apis/extensions/v1beta1/conversion.go

@@ -110,7 +110,7 @@ func Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*ScaleStatus))(in)
 	}
-	out.Replicas = int(in.Replicas)
+	out.Replicas = in.Replicas
 
 	// Normally when 2 fields map to the same internal value we favor the old field, since
 	// old clients can't be expected to know about new fields but clients that know about the
@@ -140,8 +140,7 @@ func Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*extensions.DeploymentSpec))(in)
 	}
-	out.Replicas = new(int32)
-	*out.Replicas = int32(in.Replicas)
+	out.Replicas = &in.Replicas
 	if in.Selector != nil {
 		out.Selector = new(LabelSelector)
 		if err := Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in.Selector, out.Selector, s); err != nil {
@@ -176,7 +175,7 @@ func Convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentS
 		defaulting.(func(*DeploymentSpec))(in)
 	}
 	if in.Replicas != nil {
-		out.Replicas = int(*in.Replicas)
+		out.Replicas = *in.Replicas
 	}
 
 	if in.Selector != nil {
@@ -193,11 +192,8 @@ func Convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentS
 	if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
 		return err
 	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int)
-		*out.RevisionHistoryLimit = int(*in.RevisionHistoryLimit)
-	}
-	out.MinReadySeconds = int(in.MinReadySeconds)
+	out.RevisionHistoryLimit = in.RevisionHistoryLimit
+	out.MinReadySeconds = in.MinReadySeconds
 	out.Paused = in.Paused
 	if in.RollbackTo != nil {
 		out.RollbackTo = new(extensions.RollbackConfig)
@@ -298,7 +294,7 @@ func Convert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *ReplicaSetS
 		defaulting.(func(*ReplicaSetSpec))(in)
 	}
 	if in.Replicas != nil {
-		out.Replicas = int(*in.Replicas)
+		out.Replicas = *in.Replicas
 	}
 	if in.Selector != nil {
 		out.Selector = new(unversioned.LabelSelector)
@@ -318,24 +314,9 @@ func Convert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpec, s
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*batch.JobSpec))(in)
 	}
-	if in.Parallelism != nil {
-		out.Parallelism = new(int32)
-		*out.Parallelism = int32(*in.Parallelism)
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		out.Completions = new(int32)
-		*out.Completions = int32(*in.Completions)
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		out.ActiveDeadlineSeconds = new(int64)
-		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
+	out.Parallelism = in.Parallelism
+	out.Completions = in.Completions
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
 	// unable to generate simple pointer conversion for unversioned.LabelSelector -> v1beta1.LabelSelector
 	if in.Selector != nil {
 		out.Selector = new(LabelSelector)
@@ -370,24 +351,9 @@ func Convert_v1beta1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*JobSpec))(in)
 	}
-	if in.Parallelism != nil {
-		out.Parallelism = new(int)
-		*out.Parallelism = int(*in.Parallelism)
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		out.Completions = new(int)
-		*out.Completions = int(*in.Completions)
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		out.ActiveDeadlineSeconds = new(int64)
-		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
+	out.Parallelism = in.Parallelism
+	out.Completions = in.Completions
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
 	// unable to generate simple pointer conversion for v1beta1.LabelSelector -> unversioned.LabelSelector
 	if in.Selector != nil {
 		out.Selector = new(unversioned.LabelSelector)

pkg/apis/extensions/validation/validation.go

@@ -583,7 +583,7 @@ func ValidateReplicaSetSpec(spec *extensions.ReplicaSetSpec, fldPath *field.Path
 }
 
 // Validates the given template and ensures that it is in accordance with the desired selector and replicas.
-func ValidatePodTemplateSpecForReplicaSet(template *api.PodTemplateSpec, selector labels.Selector, replicas int, fldPath *field.Path) field.ErrorList {
+func ValidatePodTemplateSpecForReplicaSet(template *api.PodTemplateSpec, selector labels.Selector, replicas int32, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 	if template == nil {
 		allErrs = append(allErrs, field.Required(fldPath, ""))

pkg/apis/extensions/validation/validation_test.go

@@ -41,7 +41,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					Name:        "myrc",
 					Subresource: "scale",
 				},
-				MinReplicas:    newInt(1),
+				MinReplicas:    newInt32(1),
 				MaxReplicas:    5,
 				CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 			},
@@ -57,7 +57,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					Name:        "myrc",
 					Subresource: "scale",
 				},
-				MinReplicas: newInt(1),
+				MinReplicas: newInt32(1),
 				MaxReplicas: 5,
 			},
 		},
@@ -75,7 +75,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					Name:        "myrc",
 					Subresource: "scale",
 				},
-				MinReplicas: newInt(1),
+				MinReplicas: newInt32(1),
 				MaxReplicas: 5,
 			},
 		},
@@ -95,7 +95,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Name: "myrc", Subresource: "scale"},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -107,7 +107,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "..", Name: "myrc", Subresource: "scale"},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -119,7 +119,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "ReplicationController", Subresource: "scale"},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -131,7 +131,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "ReplicationController", Name: "..", Subresource: "scale"},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -143,7 +143,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "ReplicationController", Name: "myrc", Subresource: ""},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -155,7 +155,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "ReplicationController", Name: "myrc", Subresource: ".."},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -167,7 +167,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				ObjectMeta: api.ObjectMeta{Name: "myautoscaler", Namespace: api.NamespaceDefault},
 				Spec: extensions.HorizontalPodAutoscalerSpec{
 					ScaleRef:       extensions.SubresourceReference{Kind: "ReplicationController", Name: "myrc", Subresource: "randomsubresource"},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: 70},
 				},
@@ -184,7 +184,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					ScaleRef: extensions.SubresourceReference{
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(-1),
+					MinReplicas: newInt32(-1),
 					MaxReplicas: 5,
 				},
 			},
@@ -200,7 +200,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					ScaleRef: extensions.SubresourceReference{
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(7),
+					MinReplicas: newInt32(7),
 					MaxReplicas: 5,
 				},
 			},
@@ -216,7 +216,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 					ScaleRef: extensions.SubresourceReference{
 						Subresource: "scale",
 					},
-					MinReplicas:    newInt(1),
+					MinReplicas:    newInt32(1),
 					MaxReplicas:    5,
 					CPUUtilization: &extensions.CPUTargetUtilization{TargetPercentage: -70},
 				},
@@ -238,7 +238,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 						Name:        "myrc",
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(1),
+					MinReplicas: newInt32(1),
 					MaxReplicas: 5,
 				},
 			},
@@ -259,7 +259,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 						Name:        "myrc",
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(1),
+					MinReplicas: newInt32(1),
 					MaxReplicas: 5,
 				},
 			},
@@ -280,7 +280,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 						Name:        "myrc",
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(1),
+					MinReplicas: newInt32(1),
 					MaxReplicas: 5,
 				},
 			},
@@ -301,7 +301,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 						Name:        "myrc",
 						Subresource: "scale",
 					},
-					MinReplicas: newInt(1),
+					MinReplicas: newInt32(1),
 					MaxReplicas: 5,
 				},
 			},
@@ -1709,8 +1709,8 @@ func TestValidateReplicaSet(t *testing.T) {
 	}
 }
 
-func newInt(val int) *int {
-	p := new(int)
+func newInt32(val int32) *int32 {
+	p := new(int32)
 	*p = val
 	return p
 }