Added label kubernetes.io/name to cluster services

The label specifies service name which is displayed in kubectl cluster-info
This commit is contained in:
Piotr Szczesniak 2015-05-11 19:31:13 +02:00
parent a98770e1ba
commit 12e44ff8a9
6 changed files with 6 additions and 2 deletions

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

@ -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
})