github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Fixup port printing.

Browse Source
This commit is contained in:
Brendan Burns 2015-06-19 15:10:22 -07:00
parent 3a598eba0e
commit f0ff1927f1
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubectl/cmd/create.go
View File

@ -127,7 +127,7 @@ func printObjectSpecificMessage(obj runtime.Object, out io.Writer) {
you will also need to explicitly open a Firewall rule for the service port(s) (%s) to serve traffic. you will also need to explicitly open a Firewall rule for the service port(s) (%s) to serve traffic.
See https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs/services-firewalls.md for more details. See https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs/services-firewalls.md for more details.
`, makePortsString(obj.Spec.Ports)) `, makePortsString(obj.Spec.Ports, false))
out.Write([]byte(msg)) out.Write([]byte(msg))
} }
if obj.Spec.Type == api.ServiceTypeNodePort { if obj.Spec.Type == api.ServiceTypeNodePort {
@ -137,16 +137,22 @@ func printObjectSpecificMessage(obj runtime.Object, out io.Writer) {
firewall rules for the service port(s) (%s) to serve traffic. firewall rules for the service port(s) (%s) to serve traffic.
See https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs/services-firewalls.md for more details. See https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs/services-firewalls.md for more details.
`, makePortsString(obj.Spec.Ports)) `, makePortsString(obj.Spec.Ports, true))
out.Write([]byte(msg)) out.Write([]byte(msg))
} }
} }
} }
func makePortsString(ports []api.ServicePort) string { func makePortsString(ports []api.ServicePort, useNodePort bool) string {
pieces := make([]string, len(ports)) pieces := make([]string, len(ports))
for ix := range ports { for ix := range ports {
pieces[ix] = fmt.Sprintf("%s:%d", strings.ToLower(string(ports[ix].Protocol)), ports[ix].NodePort) var port int
if useNodePort {
port = ports[ix].NodePort
} else {
port = ports[ix].Port
}
pieces[ix] = fmt.Sprintf("%s:%d", strings.ToLower(string(ports[ix].Protocol)), port)
} }
return strings.Join(pieces, ",") return strings.Join(pieces, ",")
} }

18
pkg/kubectl/cmd/create_test.go
View File

@ -169,6 +169,7 @@ func TestPrintObjectSpecificMessage(t *testing.T) {
func TestMakePortsString(t *testing.T) { func TestMakePortsString(t *testing.T) {
tests := []struct { tests := []struct {
ports []api.ServicePort ports []api.ServicePort
useNodePort bool
expectedOutput string expectedOutput string
}{ }{
{ports: nil, expectedOutput: ""}, {ports: nil, expectedOutput: ""},
@ -197,9 +198,24 @@ func TestMakePortsString(t *testing.T) {
}, },
expectedOutput: "tcp:80,udp:8080,tcp:9000", expectedOutput: "tcp:80,udp:8080,tcp:9000",
}, },
{ports: []api.ServicePort{
{
Port: 80,
NodePort: 9090,
Protocol: "TCP",
},
{
Port: 8080,
NodePort: 80,
Protocol: "UDP",
},
},
useNodePort: true,
expectedOutput: "tcp:9090,udp:80",
},
} }
for _, test := range tests { for _, test := range tests {
output := makePortsString(test.ports) output := makePortsString(test.ports, test.useNodePort)
if output != test.expectedOutput { if output != test.expectedOutput {
t.Errorf("expected: %s, saw: %s.", test.expectedOutput, output) t.Errorf("expected: %s, saw: %s.", test.expectedOutput, output)
} }