Merge pull request #1513 from tdemaret/master

Fix Selector to use heapster, influxdb and grafana on Minikube

deploy/addons/heapster/grafana-svc.yaml

@@ -2,10 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    kubernetes.io/cluster-service: 'true'
     kubernetes.io/name: monitoring-grafana
     kubernetes.io/minikube-addons: heapster
     kubernetes.io/minikube-addons-endpoint: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
   name: monitoring-grafana
   namespace: kube-system
 spec:

deploy/addons/heapster/heapster-rc.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    kubernetes.io/cluster-service: 'true'
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
     name: heapster
     kubernetes.io/minikube-addons: heapster
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       labels:
-        kubernetes.io/cluster-service: 'true'
+        addonmanager.kubernetes.io/mode: Reconcile
         k8s-app: heapster
     spec:
       containers:

deploy/addons/heapster/heapster-svc.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    kubernetes.io/cluster-service: 'true'
     kubernetes.io/name: heapster
     kubernetes.io/minikube-addons: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
   name: heapster
   namespace: kube-system
 spec:

deploy/addons/heapster/influxGrafana-rc.yaml

@@ -16,8 +16,8 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    kubernetes.io/cluster-service: 'true'
     name: influxGrafana
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: heapster
   name: influxdb-grafana
   namespace: kube-system
@@ -29,8 +29,8 @@ spec:
   template:
     metadata:
       labels:
-        kubernetes.io/cluster-service: 'true'
         name: influxGrafana
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - name: influxdb

deploy/addons/heapster/influxdb-svc.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    kubernetes.io/cluster-service: 'true'
     kubernetes.io/name: monitoring-influxdb
     kubernetes.io/minikube-addons: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
   name: monitoring-influxdb
   namespace: kube-system
 spec: