diff --git a/pkg/registry/apps/deployment/storage/storage_test.go b/pkg/registry/apps/deployment/storage/storage_test.go index 460abc155e2..08824a4cfb9 100644 --- a/pkg/registry/apps/deployment/storage/storage_test.go +++ b/pkg/registry/apps/deployment/storage/storage_test.go @@ -71,8 +71,8 @@ func validNewDeployment() *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{ diff --git a/pkg/registry/apps/deployment/strategy_test.go b/pkg/registry/apps/deployment/strategy_test.go index 719ad3f4b82..dd3df773c16 100644 --- a/pkg/registry/apps/deployment/strategy_test.go +++ b/pkg/registry/apps/deployment/strategy_test.go @@ -167,8 +167,8 @@ func newDeploymentWithSelectorLabels(selectorLabels map[string]string) *apps.Dep 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{ @@ -200,8 +200,8 @@ func newDeploymentWithHugePageValue(resourceName api.ResourceName, value resourc 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{ diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index b9cb164d00c..60fd585cab0 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -206,7 +206,7 @@ func TestGenericUpdate(t *testing.T) { Ports: []api.ServicePort{{ Port: 6502, Protocol: api.ProtocolTCP, - TargetPort: intstr.FromInt(6502), + TargetPort: intstr.FromInt32(6502), }}, InternalTrafficPolicy: &clusterInternalTrafficPolicy, } @@ -957,16 +957,16 @@ func TestVerifyEquiv(t *testing.T) { input: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetNodePorts(93)), expectClusterIPs: true, expectNodePorts: true, }, output: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetNodePorts(93, 76)), expect: true, }, { @@ -6147,16 +6147,16 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectNodePorts: true, }, { name: "type:NodePort_multiport_specified", svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetUniqueNodePorts), expectNodePorts: true, }, { @@ -6164,8 +6164,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetNodePorts(30080, 30080)), expectError: true, }, { @@ -6173,16 +6173,16 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP))), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP))), expectNodePorts: true, }, { name: "type:NodePort_multiport_multiproto_specified", svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP)), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP)), svctest.SetUniqueNodePorts), expectNodePorts: true, }, { @@ -6190,8 +6190,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP)), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP)), svctest.SetNodePorts(30053, 30053)), expectNodePorts: true, }, { @@ -6199,8 +6199,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 93, intstr.FromInt(93), api.ProtocolTCP), - svctest.MakeServicePort("q", 76, intstr.FromInt(76), api.ProtocolUDP)), + svctest.MakeServicePort("p", 93, intstr.FromInt32(93), api.ProtocolTCP), + svctest.MakeServicePort("q", 76, intstr.FromInt32(76), api.ProtocolUDP)), svctest.SetNodePorts(30093, 30093)), expectError: true, }, { @@ -6234,8 +6234,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetAllocateLoadBalancerNodePorts(false)), expectNodePorts: false, }, { @@ -6243,8 +6243,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetAllocateLoadBalancerNodePorts(true)), expectNodePorts: true, }, { @@ -6252,8 +6252,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetUniqueNodePorts, svctest.SetAllocateLoadBalancerNodePorts(false)), expectNodePorts: true, @@ -6262,8 +6262,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetUniqueNodePorts, svctest.SetAllocateLoadBalancerNodePorts(true)), expectNodePorts: true, @@ -6272,8 +6272,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP)), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP)), svctest.SetNodePorts(30080, 30080)), expectError: true, }, { @@ -6281,16 +6281,16 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP))), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP))), expectNodePorts: true, }, { name: "type:LoadBalancer_multiport_multiproto_specified", svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP)), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP)), svctest.SetUniqueNodePorts), expectNodePorts: true, }, { @@ -6298,8 +6298,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP)), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP)), svctest.SetNodePorts(30053, 30053)), expectNodePorts: true, }, { @@ -6307,8 +6307,8 @@ func TestCreateInitNodePorts(t *testing.T) { svc: svctest.MakeService("foo", svctest.SetTypeLoadBalancer, svctest.SetPorts( - svctest.MakeServicePort("p", 93, intstr.FromInt(93), api.ProtocolTCP), - svctest.MakeServicePort("q", 76, intstr.FromInt(76), api.ProtocolUDP)), + svctest.MakeServicePort("p", 93, intstr.FromInt32(93), api.ProtocolTCP), + svctest.MakeServicePort("q", 76, intstr.FromInt32(76), api.ProtocolUDP)), svctest.SetNodePorts(30093, 30093)), expectError: true, }} @@ -6889,8 +6889,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetIPFamilyPolicy(api.IPFamilyPolicyPreferDualStack), svctest.SetClusterIPs("10.0.0.1", "2000::1"), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -6902,8 +6902,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP))), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, expectHealthCheckNodePort: true, @@ -6923,8 +6923,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetIPFamilyPolicy(api.IPFamilyPolicyPreferDualStack), svctest.SetClusterIPs("10.0.0.1", "2000::1"), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -6945,8 +6945,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -6958,8 +6958,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 0)), // provide just 1 value expectClusterIPs: true, expectNodePorts: true, @@ -6976,8 +6976,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -6990,8 +6990,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( // swapped from above - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP), - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP))), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, expectHealthCheckNodePort: true, @@ -7007,8 +7007,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -7020,8 +7020,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30076, 0), // set [0] to [1]'s value, omit [1] svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -7039,8 +7039,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -7052,8 +7052,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30076, 30118)), // set [0] to HCNP's value expectError: true, }, @@ -7064,8 +7064,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -7077,8 +7077,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30118, 0)), // set [0] to HCNP's value, omit [1] expectError: true, }, @@ -7089,8 +7089,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30118)), expectClusterIPs: true, @@ -7102,8 +7102,8 @@ func TestUpdatePatchAllocatedValues(t *testing.T) { svctest.SetTypeLoadBalancer, svctest.SetExternalTrafficPolicy(api.ServiceExternalTrafficPolicyLocal), svctest.SetPorts( - svctest.MakeServicePort("p", 867, intstr.FromInt(867), api.ProtocolTCP), - svctest.MakeServicePort("q", 5309, intstr.FromInt(5309), api.ProtocolTCP)), + svctest.MakeServicePort("p", 867, intstr.FromInt32(867), api.ProtocolTCP), + svctest.MakeServicePort("q", 5309, intstr.FromInt32(5309), api.ProtocolTCP)), svctest.SetNodePorts(30093, 30076), svctest.SetHealthCheckNodePort(30111)), expectError: true, @@ -10577,14 +10577,14 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, }, }, { @@ -10592,14 +10592,14 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10608,15 +10608,15 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, }, }, { @@ -10624,14 +10624,14 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, }, }, { @@ -10639,14 +10639,14 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10655,15 +10655,15 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeClusterIP, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, }, }, { @@ -10671,16 +10671,16 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP), - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10689,16 +10689,16 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 8080, intstr.FromInt(8080), api.ProtocolTCP), - svctest.MakeServicePort("q", 8443, intstr.FromInt(8443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 8080, intstr.FromInt32(8080), api.ProtocolTCP), + svctest.MakeServicePort("q", 8443, intstr.FromInt32(8443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10707,16 +10707,16 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolUDP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolUDP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolUDP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolUDP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10725,16 +10725,16 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("r", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("s", 53, intstr.FromInt(53), api.ProtocolUDP))), + svctest.MakeServicePort("r", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("s", 53, intstr.FromInt32(53), api.ProtocolUDP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10743,15 +10743,15 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP))), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, update: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 53, intstr.FromInt(53), api.ProtocolTCP), - svctest.MakeServicePort("q", 53, intstr.FromInt(53), api.ProtocolUDP))), + svctest.MakeServicePort("p", 53, intstr.FromInt32(53), api.ProtocolTCP), + svctest.MakeServicePort("q", 53, intstr.FromInt32(53), api.ProtocolUDP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -10760,8 +10760,8 @@ func TestFeaturePorts(t *testing.T) { create: svcTestCase{ svc: svctest.MakeService("foo", svctest.SetTypeNodePort, svctest.SetPorts( - svctest.MakeServicePort("p", 80, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 443, intstr.FromInt(443), api.ProtocolTCP))), + svctest.MakeServicePort("p", 80, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 443, intstr.FromInt32(443), api.ProtocolTCP))), expectClusterIPs: true, expectNodePorts: true, }, @@ -11590,7 +11590,7 @@ func TestServiceRegistryResourceLocation(t *testing.T) { _, err := storage.Create(ctx, svctest.MakeService(name, svctest.SetPorts( - svctest.MakeServicePort("", 93, intstr.FromInt(80), api.ProtocolTCP))), + svctest.MakeServicePort("", 93, intstr.FromInt32(80), api.ProtocolTCP))), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { t.Fatalf("unexpected error creating service %q: %v", name, err) @@ -11600,8 +11600,8 @@ func TestServiceRegistryResourceLocation(t *testing.T) { _, err := storage.Create(ctx, svctest.MakeService("named", svctest.SetPorts( - svctest.MakeServicePort("p", 93, intstr.FromInt(80), api.ProtocolTCP), - svctest.MakeServicePort("q", 76, intstr.FromInt(81), api.ProtocolTCP))), + svctest.MakeServicePort("p", 93, intstr.FromInt32(80), api.ProtocolTCP), + svctest.MakeServicePort("q", 76, intstr.FromInt32(81), api.ProtocolTCP))), rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) if err != nil { t.Fatalf("unexpected error creating service %q: %v", "named", err) diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index a9d123cb0b0..8908615c344 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -86,7 +86,7 @@ func makeValidServicePort(name string, proto api.Protocol, port int32) api.Servi Name: name, Protocol: proto, Port: port, - TargetPort: intstr.FromInt(int(port)), + TargetPort: intstr.FromInt32(port), } } diff --git a/pkg/registry/networking/ingress/storage/storage_test.go b/pkg/registry/networking/ingress/storage/storage_test.go index 28c42ea1c48..d4b94020c00 100644 --- a/pkg/registry/networking/ingress/storage/storage_test.go +++ b/pkg/registry/networking/ingress/storage/storage_test.go @@ -53,7 +53,7 @@ var ( name = "foo-ingress" defaultHostname = "foo.bar.com" defaultBackendName = "default-backend" - defaultBackendPort = intstr.FromInt(80) + defaultBackendPort = intstr.FromInt32(80) defaultLoadBalancer = "127.0.0.1" defaultPath = "/foo" defaultPathType = networking.PathTypeImplementationSpecific diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index e9ca406710d..b2db4500431 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -43,7 +43,7 @@ func newStorage(t *testing.T) (*REST, *StatusREST, *etcd3testing.EtcdTestServer) } func validNewPodDisruptionBudget() *policy.PodDisruptionBudget { - minAvailable := intstr.FromInt(7) + minAvailable := intstr.FromInt32(7) return &policy.PodDisruptionBudget{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", @@ -91,7 +91,7 @@ func TestStatusUpdate(t *testing.T) { } obtainedPdb := obj.(*policy.PodDisruptionBudget) - minAvailable := intstr.FromInt(8) + minAvailable := intstr.FromInt32(8) update := policy.PodDisruptionBudget{ ObjectMeta: obtainedPdb.ObjectMeta, Spec: policy.PodDisruptionBudgetSpec{ diff --git a/pkg/registry/policy/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go index 7bc81802002..78dbf321c27 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy_test.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy_test.go @@ -132,7 +132,7 @@ func testPodDisruptionBudgetStrategyWithUnhealthyPodEvictionPolicy(t *testing.T, } validSelector := map[string]string{"a": "b"} - minAvailable := intstr.FromInt(3) + minAvailable := intstr.FromInt32(3) pdb := &policy.PodDisruptionBudget{ ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault}, Spec: policy.PodDisruptionBudgetSpec{ @@ -196,7 +196,7 @@ func testPodDisruptionBudgetStrategy(t *testing.T) { } validSelector := map[string]string{"a": "b"} - minAvailable := intstr.FromInt(3) + minAvailable := intstr.FromInt32(3) pdb := &policy.PodDisruptionBudget{ ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault}, Spec: policy.PodDisruptionBudgetSpec{ @@ -267,8 +267,8 @@ func TestPodDisruptionBudgetStatusStrategy(t *testing.T) { t.Errorf("PodDisruptionBudgetStatus should not allow create on update") } - oldMinAvailable := intstr.FromInt(3) - newMinAvailable := intstr.FromInt(2) + oldMinAvailable := intstr.FromInt32(3) + newMinAvailable := intstr.FromInt32(2) validSelector := map[string]string{"a": "b"} oldPdb := &policy.PodDisruptionBudget{ @@ -337,8 +337,8 @@ func TestPodDisruptionBudgetStatusValidationByApiVersion(t *testing.T) { APIVersion: tc.apiVersion, }) - oldMaxUnavailable := intstr.FromInt(2) - newMaxUnavailable := intstr.FromInt(3) + oldMaxUnavailable := intstr.FromInt32(2) + newMaxUnavailable := intstr.FromInt32(3) oldPdb := &policy.PodDisruptionBudget{ ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault, ResourceVersion: "10"}, Spec: policy.PodDisruptionBudgetSpec{