Merge pull request #8067 from piosz/kubectl

cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml

@@ -4,6 +4,7 @@ metadata:
   labels: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Grafana"
   name: monitoring-grafana
 spec: 
   ports: 

cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml

@@ -4,6 +4,7 @@ metadata:
   labels: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "InfluxDB"
   name: monitoring-influxdb
 spec: 
   ports: 

cluster/addons/dns/skydns-svc.yaml.in

@@ -5,8 +5,8 @@ metadata:
   namespace: default
   labels:
     k8s-app: kube-dns
-    name: kube-dns
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "KubeDNS"
 spec:
   selector:
     k8s-app: kube-dns

cluster/addons/fluentd-elasticsearch/es-service.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     name: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Elasticsearch"
   name: elasticsearch-logging
 spec:
   ports:

cluster/addons/fluentd-elasticsearch/kibana-service.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     name: kibana-logging
     kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "Kibana"
   name: kibana-logging
 spec:
   ports:

pkg/kubectl/cmd/clusterinfo.go

@@ -79,7 +79,7 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
 			} else {
 				link = client.Host + "/api/v1beta3/proxy/namespaces/" + service.ObjectMeta.Namespace + "/services/" + service.ObjectMeta.Name
 			}
-			printService(out, service.ObjectMeta.Labels["name"], link)
+			printService(out, service.ObjectMeta.Labels["kubernetes.io/name"], link)
 		}
 		return nil
 	})