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

Merge pull request #47694 from FengyunPan/display-service-type

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47694, 47772, 47783, 47803, 47673)

Output TYPE for getting service

**What this PR does / why we need it**:
Now service already supported 4 ServiceTypes, ServiceTypes is
friendly to distinguish services, so outputing service type better
when running 'kubectl get service'.

**Release note**:
```release-note
  NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-23 08:29:23 -07:00 committed by GitHub
commit ae9ca46927
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/cmd/cmd_test.go
View File

@ -594,6 +594,7 @@ func Example_printServiceWithNamespacesAndLabels() {
"s": "magic", "s": "magic",
}, },
ClusterIP: "10.1.1.1", ClusterIP: "10.1.1.1",
Type: api.ServiceTypeClusterIP,
}, },
Status: api.ServiceStatus{}, Status: api.ServiceStatus{},
}, },
@ -615,6 +616,7 @@ func Example_printServiceWithNamespacesAndLabels() {
"s": "kazam", "s": "kazam",
}, },
ClusterIP: "10.1.1.2", ClusterIP: "10.1.1.2",
Type: api.ServiceTypeClusterIP,
}, },
Status: api.ServiceStatus{}, Status: api.ServiceStatus{},
}}, }},
@ -627,9 +629,9 @@ func Example_printServiceWithNamespacesAndLabels() {
fmt.Printf("Unexpected error: %v", err) fmt.Printf("Unexpected error: %v", err)
} }
// Output: // Output:
// |NAMESPACE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE L1| // |NAMESPACE NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE L1|
// |ns1 svc1 10.1.1.1 <unknown> 53/UDP,53/TCP 10y value| // |ns1 svc1 ClusterIP 10.1.1.1 <none> 53/UDP,53/TCP 10y value|
// |ns2 svc2 10.1.1.2 <unknown> 80/TCP,8080/TCP 10y dolla-bill-yall| // |ns2 svc2 ClusterIP 10.1.1.2 <none> 80/TCP,8080/TCP 10y dolla-bill-yall|
// || // ||
} }

10
pkg/printers/internalversion/printers.go
View File

@ -67,7 +67,7 @@ var (
jobColumns = []string{"NAME", "DESIRED", "SUCCESSFUL", "AGE"} jobColumns = []string{"NAME", "DESIRED", "SUCCESSFUL", "AGE"}
cronJobColumns = []string{"NAME", "SCHEDULE", "SUSPEND", "ACTIVE", "LAST-SCHEDULE"} cronJobColumns = []string{"NAME", "SCHEDULE", "SUSPEND", "ACTIVE", "LAST-SCHEDULE"}
batchJobWideColumns = []string{"CONTAINER(S)", "IMAGE(S)", "SELECTOR"} batchJobWideColumns = []string{"CONTAINER(S)", "IMAGE(S)", "SELECTOR"}
serviceColumns = []string{"NAME", "CLUSTER-IP", "EXTERNAL-IP", "PORT(S)", "AGE"} serviceColumns = []string{"NAME", "TYPE", "CLUSTER-IP", "EXTERNAL-IP", "PORT(S)", "AGE"}
serviceWideColumns = []string{"SELECTOR"} serviceWideColumns = []string{"SELECTOR"}
ingressColumns = []string{"NAME", "HOSTS", "ADDRESS", "PORTS", "AGE"} ingressColumns = []string{"NAME", "HOSTS", "ADDRESS", "PORTS", "AGE"}
statefulSetColumns = []string{"NAME", "DESIRED", "CURRENT", "AGE"} statefulSetColumns = []string{"NAME", "DESIRED", "CURRENT", "AGE"}
@ -711,7 +711,7 @@ func getServiceExternalIP(svc *api.Service, wide bool) string {
if len(svc.Spec.ExternalIPs) > 0 { if len(svc.Spec.ExternalIPs) > 0 {
return strings.Join(svc.Spec.ExternalIPs, ",") return strings.Join(svc.Spec.ExternalIPs, ",")
} }
return "<nodes>" return "<none>"
case api.ServiceTypeLoadBalancer: case api.ServiceTypeLoadBalancer:
lbIps := loadBalancerStatusStringer(svc.Status.LoadBalancer, wide) lbIps := loadBalancerStatusStringer(svc.Status.LoadBalancer, wide)
if len(svc.Spec.ExternalIPs) > 0 { if len(svc.Spec.ExternalIPs) > 0 {
@ -742,9 +742,8 @@ func makePortString(ports []api.ServicePort) string {
func printService(svc *api.Service, w io.Writer, options printers.PrintOptions) error { func printService(svc *api.Service, w io.Writer, options printers.PrintOptions) error {
name := printers.FormatResourceName(options.Kind, svc.Name, options.WithKind) name := printers.FormatResourceName(options.Kind, svc.Name, options.WithKind)
namespace := svc.Namespace namespace := svc.Namespace
svcType := svc.Spec.Type
internalIP := svc.Spec.ClusterIP internalIP := svc.Spec.ClusterIP
externalIP := getServiceExternalIP(svc, options.Wide) externalIP := getServiceExternalIP(svc, options.Wide)
@ -753,8 +752,9 @@ func printService(svc *api.Service, w io.Writer, options printers.PrintOptions)
return err return err
} }
} }
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s", if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s",
name, name,
string(svcType),
internalIP, internalIP,
externalIP, externalIP,
makePortString(svc.Spec.Ports), makePortString(svc.Spec.Ports),

8
pkg/printers/internalversion/printers_test.go
View File

@ -2334,17 +2334,17 @@ func TestPrintService(t *testing.T) {
{Protocol: "tcp", {Protocol: "tcp",
Port: 2233}, Port: 2233},
}, },
ClusterIP: "0.0.0.0", ClusterIP: "10.9.8.7",
}, },
}, },
"test1\t0.0.0.0\t<none>\t2233/tcp\t<unknown>\n", "test1\tClusterIP\t10.9.8.7\t<none>\t2233/tcp\t<unknown>\n",
}, },
{ {
// Test name, cluster ip, port:nodePort with protocol // Test name, cluster ip, port:nodePort with protocol
api.Service{ api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "test2"}, ObjectMeta: metav1.ObjectMeta{Name: "test2"},
Spec: api.ServiceSpec{ Spec: api.ServiceSpec{
Type: api.ServiceTypeClusterIP, Type: api.ServiceTypeNodePort,
Ports: []api.ServicePort{ Ports: []api.ServicePort{
{Protocol: "tcp", {Protocol: "tcp",
Port: 8888, Port: 8888,
@ -2354,7 +2354,7 @@ func TestPrintService(t *testing.T) {
ClusterIP: "10.9.8.7", ClusterIP: "10.9.8.7",
}, },
}, },
"test2\t10.9.8.7\t<none>\t8888:9999/tcp\t<unknown>\n", "test2\tNodePort\t10.9.8.7\t<none>\t8888:9999/tcp\t<unknown>\n",
}, },
} }