Merge pull request #8469 from satnam6502/heapster

Add explicit version to name of monitoring RCs

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -1,18 +1,22 @@
 apiVersion: v1beta3
 kind: ReplicationController
 metadata: 
+  name: monitoring-heapster-v1
+  namespace: default
   labels: 
-    name: heapster
+    k8s-app: heapster
+    version: v1
     kubernetes.io/cluster-service: "true"
-  name: monitoring-heapster-controller
 spec: 
   replicas: 1
   selector: 
-    name: heapster
+    k8s-app: heapster
+    version: v1
   template: 
     metadata: 
       labels: 
-        name: heapster
+        k8s-app: heapster
+        version: v1
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 

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

@@ -1,14 +1,15 @@
 apiVersion: v1beta3
 kind: Service
-metadata: 
+metadata:
+  name: monitoring-grafana
+  namespace: default 
   labels: 
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Grafana"
-  name: monitoring-grafana
 spec: 
   ports: 
     - port: 80
       targetPort: 8080
   selector: 
-    name: influxGrafana
+    k8s-app: influxGrafana
 

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -1,18 +1,22 @@
 apiVersion: v1beta3
 kind: ReplicationController
-metadata: 
+metadata:
+  name: monitoring-heapster-v1
+  namespace: default 
   labels: 
-    name: heapster
+    k8s-app: heapster
+    version: v1
     kubernetes.io/cluster-service: "true"
-  name: monitoring-heapster-controller
 spec: 
   replicas: 1
   selector: 
-    name: heapster
+    k8s-app: heapster
+    version: v1
   template: 
     metadata: 
       labels: 
-        name: heapster
+        k8s-app: heapster
+        version: v1
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 

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

@@ -1,18 +1,22 @@
 apiVersion: v1beta3
 kind: ReplicationController
-metadata: 
+metadata:
+  name: monitoring-influx-grafana-v1
+  namespace: default 
   labels: 
-    name: influxGrafana
+    k8s-app: influxGrafana
+    version: v1
     kubernetes.io/cluster-service: "true"
-  name: monitoring-influx-grafana-controller
 spec: 
   replicas: 1
   selector: 
-    name: influxGrafana
+    k8s-app: influxGrafana
+    version: v1
   template: 
     metadata: 
       labels: 
-        name: influxGrafana
+        k8s-app: influxGrafana
+        version: v1
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 

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

@@ -1,9 +1,10 @@
 apiVersion: v1beta3
 kind: Service
-metadata: 
-  labels: 
-    name: influxGrafana
+metadata:
   name: monitoring-influxdb
+  namespace: default 
+  labels: 
+    k8s-app: influxGrafana
 spec: 
   ports: 
     - name: http
@@ -13,5 +14,5 @@ spec:
       port: 8086
       targetPort: 8086
   selector: 
-    name: influxGrafana
+    k8s-app: influxGrafana