API: use new intstr functions

pkg/api/service/testing/make.go

@@ -47,7 +47,7 @@ func MakeService(name string, tweaks ...Tweak) *api.Service {
 	// Default to ClusterIP
 	SetTypeClusterIP(svc)
 	// Default to 1 port
-	SetPorts(MakeServicePort("", 93, intstr.FromInt(76), api.ProtocolTCP))(svc)
+	SetPorts(MakeServicePort("", 93, intstr.FromInt32(76), api.ProtocolTCP))(svc)
 
 	for _, tweak := range tweaks {
 		tweak(svc)

pkg/api/v1/pod/util_test.go

@@ -41,7 +41,7 @@ func TestFindPort(t *testing.T) {
 	}{{
 		name:       "valid int, no ports",
 		containers: []v1.Container{{}},
-		port:       intstr.FromInt(93),
+		port:       intstr.FromInt32(93),
 		expected:   93,
 		pass:       true,
 	}, {
@@ -55,7 +55,7 @@ func TestFindPort(t *testing.T) {
 			ContainerPort: 22,
 			Protocol:      "TCP",
 		}}}},
-		port:     intstr.FromInt(93),
+		port:     intstr.FromInt32(93),
 		expected: 93,
 		pass:     true,
 	}, {

pkg/apis/apps/fuzzer/fuzzer.go

@@ -94,8 +94,8 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 			} else {
 				rollingUpdate := apps.RollingUpdateDeployment{}
 				if c.RandBool() {
-					rollingUpdate.MaxUnavailable = intstr.FromInt(int(c.Rand.Int31()))
-					rollingUpdate.MaxSurge = intstr.FromInt(int(c.Rand.Int31()))
+					rollingUpdate.MaxUnavailable = intstr.FromInt32(c.Rand.Int31())
+					rollingUpdate.MaxSurge = intstr.FromInt32(c.Rand.Int31())
 				} else {
 					rollingUpdate.MaxSurge = intstr.FromString(fmt.Sprintf("%d%%", c.Rand.Int31()))
 				}
@@ -127,8 +127,8 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 				rollingUpdate := apps.RollingUpdateDaemonSet{}
 				if c.RandBool() {
 					if c.RandBool() {
-						rollingUpdate.MaxUnavailable = intstr.FromInt(int(c.Rand.Int31()))
-						rollingUpdate.MaxSurge = intstr.FromInt(int(c.Rand.Int31()))
+						rollingUpdate.MaxUnavailable = intstr.FromInt32(c.Rand.Int31())
+						rollingUpdate.MaxSurge = intstr.FromInt32(c.Rand.Int31())
 					} else {
 						rollingUpdate.MaxSurge = intstr.FromString(fmt.Sprintf("%d%%", c.Rand.Int31()))
 					}

pkg/apis/apps/v1/conversion_test.go

@@ -225,8 +225,8 @@ func TestV1StatefulSetUpdateStrategyConversion(t *testing.T) {
 }
 
 func TestV1RollingUpdateDaemonSetConversion(t *testing.T) {
-	intorstr := intstr.FromInt(1)
-	maxSurge := intstr.FromInt(0)
+	intorstr := intstr.FromInt32(1)
+	maxSurge := intstr.FromInt32(0)
 	testcases := map[string]struct {
 		rollingUpdateDs1 *apps.RollingUpdateDaemonSet
 		rollingUpdateDs2 *appsv1.RollingUpdateDaemonSet
@@ -436,8 +436,8 @@ func TestV1DeploymentSpecConversion(t *testing.T) {
 }
 
 func TestV1DeploymentStrategyConversion(t *testing.T) {
-	maxUnavailable := intstr.FromInt(2)
-	maxSurge := intstr.FromInt(2)
+	maxUnavailable := intstr.FromInt32(2)
+	maxSurge := intstr.FromInt32(2)
 	appsRollingUpdate := apps.RollingUpdateDeployment{MaxUnavailable: maxUnavailable, MaxSurge: maxSurge}
 	appsv1RollingUpdate := appsv1.RollingUpdateDeployment{MaxUnavailable: &maxUnavailable, MaxSurge: &maxSurge}
 	testcases := map[string]struct {
@@ -477,8 +477,8 @@ func TestV1DeploymentStrategyConversion(t *testing.T) {
 
 func TestV1RollingUpdateDeploymentConversion(t *testing.T) {
 	nilIntStr := intstr.IntOrString{}
-	maxUnavailable := intstr.FromInt(2)
-	maxSurge := intstr.FromInt(2)
+	maxUnavailable := intstr.FromInt32(2)
+	maxSurge := intstr.FromInt32(2)
 	testcases := map[string]struct {
 		rollingUpdateDeployment1 *apps.RollingUpdateDeployment
 		rollingUpdateDeployment2 *appsv1.RollingUpdateDeployment

pkg/apis/apps/v1/defaults.go

@@ -84,12 +84,12 @@ func SetDefaults_DaemonSet(obj *appsv1.DaemonSet) {
 		}
 		if updateStrategy.RollingUpdate.MaxUnavailable == nil {
 			// Set default MaxUnavailable as 1 by default.
-			maxUnavailable := intstr.FromInt(1)
+			maxUnavailable := intstr.FromInt32(1)
 			updateStrategy.RollingUpdate.MaxUnavailable = &maxUnavailable
 		}
 		if updateStrategy.RollingUpdate.MaxSurge == nil {
 			// Set default MaxSurge as 0 by default.
-			maxSurge := intstr.FromInt(0)
+			maxSurge := intstr.FromInt32(0)
 			updateStrategy.RollingUpdate.MaxSurge = &maxSurge
 		}
 	}
@@ -121,7 +121,7 @@ func SetDefaults_StatefulSet(obj *appsv1.StatefulSet) {
 		}
 		if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) {
 			if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil {
-				maxUnavailable := intstr.FromInt(1)
+				maxUnavailable := intstr.FromInt32(1)
 				obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable = &maxUnavailable
 			}
 		}

pkg/apis/apps/v1/defaults_test.go

@@ -39,8 +39,8 @@ import (
 
 func TestSetDefaultDaemonSetSpec(t *testing.T) {
 	defaultLabels := map[string]string{"foo": "bar"}
-	maxUnavailable := intstr.FromInt(1)
-	maxSurge := intstr.FromInt(0)
+	maxUnavailable := intstr.FromInt32(1)
+	maxSurge := intstr.FromInt32(0)
 	period := int64(v1.DefaultTerminationGracePeriodSeconds)
 	defaultTemplate := v1.PodTemplateSpec{
 		Spec: v1.PodSpec{
@@ -624,7 +624,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
 
 func TestSetDefaultDeployment(t *testing.T) {
 	defaultIntOrString := intstr.FromString("25%")
-	differentIntOrString := intstr.FromInt(5)
+	differentIntOrString := intstr.FromInt32(5)
 	period := int64(v1.DefaultTerminationGracePeriodSeconds)
 	defaultTemplate := v1.PodTemplateSpec{
 		Spec: v1.PodSpec{

pkg/apis/apps/v1beta1/defaults.go

@@ -78,7 +78,7 @@ func SetDefaults_StatefulSet(obj *appsv1beta1.StatefulSet) {
 		}
 		if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) {
 			if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil {
-				maxUnavailable := intstr.FromInt(1)
+				maxUnavailable := intstr.FromInt32(1)
 				obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable = &maxUnavailable
 			}
 		}

pkg/apis/apps/v1beta1/defaults_test.go

@@ -39,7 +39,7 @@ import (
 
 func TestSetDefaultDeployment(t *testing.T) {
 	defaultIntOrString := intstr.FromString("25%")
-	differentIntOrString := intstr.FromInt(5)
+	differentIntOrString := intstr.FromInt32(5)
 	period := int64(v1.DefaultTerminationGracePeriodSeconds)
 	defaultTemplate := v1.PodTemplateSpec{
 		Spec: v1.PodSpec{

pkg/apis/apps/v1beta2/conversion_test.go

@@ -152,8 +152,8 @@ func TestV1beta2StatefulSetUpdateStrategyConversion(t *testing.T) {
 }
 
 func TestV1beta2RollingUpdateDaemonSetConversion(t *testing.T) {
-	intorstr := intstr.FromInt(1)
-	maxSurge := intstr.FromInt(0)
+	intorstr := intstr.FromInt32(1)
+	maxSurge := intstr.FromInt32(0)
 	testcases := map[string]struct {
 		rollingUpdateDs1 *apps.RollingUpdateDaemonSet
 		rollingUpdateDs2 *v1beta2.RollingUpdateDaemonSet
@@ -489,8 +489,8 @@ func TestV1beta2DeploymentSpecConversion(t *testing.T) {
 }
 
 func TestV1beta2DeploymentStrategyConversion(t *testing.T) {
-	maxUnavailable := intstr.FromInt(2)
-	maxSurge := intstr.FromInt(2)
+	maxUnavailable := intstr.FromInt32(2)
+	maxSurge := intstr.FromInt32(2)
 	extensionsRollingUpdate := apps.RollingUpdateDeployment{MaxUnavailable: maxUnavailable, MaxSurge: maxSurge}
 	v1beta2RollingUpdate := v1beta2.RollingUpdateDeployment{MaxUnavailable: &maxUnavailable, MaxSurge: &maxSurge}
 	testcases := map[string]struct {
@@ -530,8 +530,8 @@ func TestV1beta2DeploymentStrategyConversion(t *testing.T) {
 
 func TestV1beta2RollingUpdateDeploymentConversion(t *testing.T) {
 	nilIntStr := intstr.IntOrString{}
-	maxUnavailable := intstr.FromInt(2)
-	maxSurge := intstr.FromInt(2)
+	maxUnavailable := intstr.FromInt32(2)
+	maxSurge := intstr.FromInt32(2)
 	testcases := map[string]struct {
 		rollingUpdateDeployment1 *apps.RollingUpdateDeployment
 		rollingUpdateDeployment2 *v1beta2.RollingUpdateDeployment

pkg/apis/apps/v1beta2/defaults.go

@@ -41,12 +41,12 @@ func SetDefaults_DaemonSet(obj *appsv1beta2.DaemonSet) {
 		}
 		if updateStrategy.RollingUpdate.MaxUnavailable == nil {
 			// Set default MaxUnavailable as 1 by default.
-			maxUnavailable := intstr.FromInt(1)
+			maxUnavailable := intstr.FromInt32(1)
 			updateStrategy.RollingUpdate.MaxUnavailable = &maxUnavailable
 		}
 		if updateStrategy.RollingUpdate.MaxSurge == nil {
 			// Set default MaxSurge as 0 by default.
-			maxSurge := intstr.FromInt(0)
+			maxSurge := intstr.FromInt32(0)
 			updateStrategy.RollingUpdate.MaxSurge = &maxSurge
 		}
 	}
@@ -78,7 +78,7 @@ func SetDefaults_StatefulSet(obj *appsv1beta2.StatefulSet) {
 		}
 		if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) {
 			if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil {
-				maxUnavailable := intstr.FromInt(1)
+				maxUnavailable := intstr.FromInt32(1)
 				obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable = &maxUnavailable
 			}
 		}

pkg/apis/apps/v1beta2/defaults_test.go

@@ -39,8 +39,8 @@ import (
 
 func TestSetDefaultDaemonSetSpec(t *testing.T) {
 	defaultLabels := map[string]string{"foo": "bar"}
-	maxUnavailable := intstr.FromInt(1)
-	maxSurge := intstr.FromInt(0)
+	maxUnavailable := intstr.FromInt32(1)
+	maxSurge := intstr.FromInt32(0)
 	period := int64(v1.DefaultTerminationGracePeriodSeconds)
 	defaultTemplate := v1.PodTemplateSpec{
 		Spec: v1.PodSpec{
@@ -494,7 +494,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
 
 func TestSetDefaultDeployment(t *testing.T) {
 	defaultIntOrString := intstr.FromString("25%")
-	differentIntOrString := intstr.FromInt(5)
+	differentIntOrString := intstr.FromInt32(5)
 	period := int64(v1.DefaultTerminationGracePeriodSeconds)
 	defaultTemplate := v1.PodTemplateSpec{
 		Spec: v1.PodSpec{

pkg/apis/apps/validation/validation_test.go

@@ -288,7 +288,7 @@ func TestValidateStatefulSet(t *testing.T) {
 				tweakReplicas(3),
 				tweakUpdateStrategyType(apps.RollingUpdateStatefulSetStrategyType),
 				tweakRollingUpdatePartition(2),
-				tweakMaxUnavailable(intstr.FromInt(2)),
+				tweakMaxUnavailable(intstr.FromInt32(2)),
 			),
 		},
 		{
@@ -495,7 +495,7 @@ func TestValidateStatefulSet(t *testing.T) {
 			set: mkStatefulSet(&validPodTemplate,
 				tweakReplicas(3),
 				tweakUpdateStrategyType(apps.RollingUpdateStatefulSetStrategyType),
-				tweakMaxUnavailable(intstr.FromInt(0)),
+				tweakMaxUnavailable(intstr.FromInt32(0)),
 			),
 			errs: field.ErrorList{
 				field.Invalid(field.NewPath("spec", "updateStrategy", "rollingUpdate", "maxUnavailable"), nil, ""),
@@ -1742,7 +1742,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 					UpdateStrategy: apps.DaemonSetUpdateStrategy{
 						Type: apps.RollingUpdateDaemonSetStrategyType,
 						RollingUpdate: &apps.RollingUpdateDaemonSet{
-							MaxUnavailable: intstr.FromInt(1),
+							MaxUnavailable: intstr.FromInt32(1),
 						},
 					},
 				},
@@ -1769,7 +1769,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
 					UpdateStrategy: apps.DaemonSetUpdateStrategy{
 						Type: apps.RollingUpdateDaemonSetStrategyType,
 						RollingUpdate: &apps.RollingUpdateDaemonSet{
-							MaxUnavailable: intstr.FromInt(1),
+							MaxUnavailable: intstr.FromInt32(1),
 						},
 					},
 				},
@@ -2275,8 +2275,8 @@ func validDeployment() *apps.Deployment {
 			Strategy: apps.DeploymentStrategy{
 				Type: apps.RollingUpdateDeploymentStrategyType,
 				RollingUpdate: &apps.RollingUpdateDeployment{
-					MaxSurge:       intstr.FromInt(1),
-					MaxUnavailable: intstr.FromInt(1),
+					MaxSurge:       intstr.FromInt32(1),
+					MaxUnavailable: intstr.FromInt32(1),
 				},
 			},
 			Template: api.PodTemplateSpec{
@@ -2366,7 +2366,7 @@ func TestValidateDeployment(t *testing.T) {
 		Type: apps.RollingUpdateDeploymentStrategyType,
 		RollingUpdate: &apps.RollingUpdateDeployment{
 			MaxSurge:       intstr.FromString("0%"),
-			MaxUnavailable: intstr.FromInt(0),
+			MaxUnavailable: intstr.FromInt32(0),
 		},
 	}
 	errorCases["may not be 0 when `maxSurge` is 0"] = invalidRollingUpdateDeployment
@@ -3497,13 +3497,13 @@ func TestDaemonSetUpdateMaxSurge(t *testing.T) {
 		},
 		"invalid: zero": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(0),
+				MaxUnavailable: intstr.FromInt32(0),
 			},
 			expectError: true,
 		},
 		"valid: one": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(1),
+				MaxUnavailable: intstr.FromInt32(1),
 			},
 		},
 		"valid: one percent": {
@@ -3539,13 +3539,13 @@ func TestDaemonSetUpdateMaxSurge(t *testing.T) {
 		},
 		"invalid: surge enabled, unavailable zero": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(0),
+				MaxUnavailable: intstr.FromInt32(0),
 			},
 			expectError: true,
 		},
 		"valid: surge enabled, unavailable one": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(1),
+				MaxUnavailable: intstr.FromInt32(1),
 			},
 		},
 		"valid: surge enabled, unavailable one percent": {
@@ -3573,13 +3573,13 @@ func TestDaemonSetUpdateMaxSurge(t *testing.T) {
 		},
 		"invalid: surge enabled, surge zero": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxSurge: intstr.FromInt(0),
+				MaxSurge: intstr.FromInt32(0),
 			},
 			expectError: true,
 		},
 		"valid: surge enabled, surge one": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxSurge: intstr.FromInt(1),
+				MaxSurge: intstr.FromInt32(1),
 			},
 		},
 		"valid: surge enabled, surge one percent": {
@@ -3616,14 +3616,14 @@ func TestDaemonSetUpdateMaxSurge(t *testing.T) {
 		},
 		"invalid: surge enabled, surge and unavailable zero": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(0),
-				MaxSurge:       intstr.FromInt(0),
+				MaxUnavailable: intstr.FromInt32(0),
+				MaxSurge:       intstr.FromInt32(0),
 			},
 			expectError: true,
 		},
 		"invalid: surge enabled, surge and unavailable mixed zero": {
 			ds: &apps.RollingUpdateDaemonSet{
-				MaxUnavailable: intstr.FromInt(0),
+				MaxUnavailable: intstr.FromInt32(0),
 				MaxSurge:       intstr.FromString("0%"),
 			},
 			expectError: true,

pkg/apis/core/v1/defaults.go

@@ -118,8 +118,8 @@ func SetDefaults_Service(obj *v1.Service) {
 		if sp.Protocol == "" {
 			sp.Protocol = v1.ProtocolTCP
 		}
-		if sp.TargetPort == intstr.FromInt(0) || sp.TargetPort == intstr.FromString("") {
-			sp.TargetPort = intstr.FromInt(int(sp.Port))
+		if sp.TargetPort == intstr.FromInt32(0) || sp.TargetPort == intstr.FromString("") {
+			sp.TargetPort = intstr.FromInt32(sp.Port)
 		}
 	}
 	// Defaults ExternalTrafficPolicy field for NodePort / LoadBalancer service