github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Refactor IntOrString into a new pkg

Browse Source 
pkg/util/intstr is a cleaner encapsulation for this type and supporting
functions.  No behavioral change.
This commit is contained in:
Tim Hockin
2015-11-09 22:28:45 -08:00
parent 3a07af0b28
commit ba383bcfeb
63 changed files with 676 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/kubectl/service_test.go
View File

@@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/intstr"
)
func TestGenerateService(t *testing.T) {
@@ -52,7 +52,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "TCP",
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
},
},
@@ -81,7 +81,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "UDP",
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
},
@@ -114,7 +114,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "TCP",
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
},
},
@@ -143,7 +143,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "UDP",
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
ExternalIPs: []string{"1.2.3.4"},
@@ -174,7 +174,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "UDP",
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
Type: api.ServiceTypeLoadBalancer,
@@ -205,7 +205,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "UDP",
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
Type: api.ServiceTypeNodePort,
@@ -236,7 +236,7 @@ func TestGenerateService(t *testing.T) {
{
Port: 80,
Protocol: "UDP",
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
Type: api.ServiceTypeNodePort,
@@ -266,7 +266,7 @@ func TestGenerateService(t *testing.T) {
Name: "default",
Port: 80,
Protocol: "TCP",
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
},
},
@@ -296,7 +296,7 @@ func TestGenerateService(t *testing.T) {
Name: "default",
Port: 80,
Protocol: "TCP",
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
},
SessionAffinity: api.ServiceAffinityClientIP,
@@ -325,13 +325,13 @@ func TestGenerateService(t *testing.T) {
Name: "port-1",
Port: 80,
Protocol: api.ProtocolTCP,
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
{
Name: "port-2",
Port: 443,
Protocol: api.ProtocolTCP,
TargetPort: util.NewIntOrStringFromString("foobar"),
TargetPort: intstr.FromString("foobar"),
},
},
},
@@ -359,13 +359,13 @@ func TestGenerateService(t *testing.T) {
Name: "port-1",
Port: 80,
Protocol: api.ProtocolUDP,
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
{
Name: "port-2",
Port: 443,
Protocol: api.ProtocolUDP,
TargetPort: util.NewIntOrStringFromInt(1234),
TargetPort: intstr.FromInt(1234),
},
},
},
@@ -392,13 +392,13 @@ func TestGenerateService(t *testing.T) {
Name: "port-1",
Port: 80,
Protocol: api.ProtocolTCP,
TargetPort: util.NewIntOrStringFromInt(80),
TargetPort: intstr.FromInt(80),
},
{
Name: "port-2",
Port: 443,
Protocol: api.ProtocolTCP,
TargetPort: util.NewIntOrStringFromInt(443),
TargetPort: intstr.FromInt(443),
},
},
},