Merge pull request #8067 from piosz/kubectl

Added label kubernetes.io/name to cluster services
2015-05-12 17:09:22 -07:00
parent de0d59be05 12e44ff8a9
commit c2fecff3d5
6 changed files with 6 additions and 2 deletions
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/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:
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/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: