From 55e1d432babf53e3b5a517664fa1d2b413b31dbd Mon Sep 17 00:00:00 2001 From: Thibaut Demaret Date: Sat, 20 May 2017 06:48:30 +0200 Subject: [PATCH 1/3] Fix Selector to use heapster, influxdb and grafana on Minikube --- deploy/addons/heapster/grafana-svc.yaml | 1 - deploy/addons/heapster/heapster-rc.yaml | 3 +-- deploy/addons/heapster/heapster-svc.yaml | 1 - deploy/addons/heapster/influxGrafana-rc.yaml | 4 ++-- deploy/addons/heapster/influxdb-svc.yaml | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/deploy/addons/heapster/grafana-svc.yaml b/deploy/addons/heapster/grafana-svc.yaml index 8f4eace1c6..fba25a8c07 100644 --- a/deploy/addons/heapster/grafana-svc.yaml +++ b/deploy/addons/heapster/grafana-svc.yaml @@ -2,7 +2,6 @@ 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 diff --git a/deploy/addons/heapster/heapster-rc.yaml b/deploy/addons/heapster/heapster-rc.yaml index df09248a57..d08e0a6a37 100644 --- a/deploy/addons/heapster/heapster-rc.yaml +++ b/deploy/addons/heapster/heapster-rc.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: ReplicationController metadata: labels: - kubernetes.io/cluster-service: 'true' k8s-app: heapster name: heapster kubernetes.io/minikube-addons: heapster @@ -16,7 +15,7 @@ spec: template: metadata: labels: - kubernetes.io/cluster-service: 'true' + addonmanager.kubernetes.io/mode: Reconcile k8s-app: heapster spec: containers: diff --git a/deploy/addons/heapster/heapster-svc.yaml b/deploy/addons/heapster/heapster-svc.yaml index 6719f2c78e..7ea584a2ab 100644 --- a/deploy/addons/heapster/heapster-svc.yaml +++ b/deploy/addons/heapster/heapster-svc.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: labels: - kubernetes.io/cluster-service: 'true' kubernetes.io/name: heapster kubernetes.io/minikube-addons: heapster name: heapster diff --git a/deploy/addons/heapster/influxGrafana-rc.yaml b/deploy/addons/heapster/influxGrafana-rc.yaml index 83be0c11bd..8a9baa1f55 100644 --- a/deploy/addons/heapster/influxGrafana-rc.yaml +++ b/deploy/addons/heapster/influxGrafana-rc.yaml @@ -16,7 +16,6 @@ apiVersion: v1 kind: ReplicationController metadata: labels: - kubernetes.io/cluster-service: 'true' name: influxGrafana kubernetes.io/minikube-addons: heapster name: influxdb-grafana @@ -26,11 +25,12 @@ spec: selector: addonmanager.kubernetes.io/mode: Reconcile name: influxGrafana + #name: influxdb-grafana template: metadata: labels: - kubernetes.io/cluster-service: 'true' name: influxGrafana + addonmanager.kubernetes.io/mode: Reconcile spec: containers: - name: influxdb diff --git a/deploy/addons/heapster/influxdb-svc.yaml b/deploy/addons/heapster/influxdb-svc.yaml index 5ba0fc97fa..cd2cfabd6e 100644 --- a/deploy/addons/heapster/influxdb-svc.yaml +++ b/deploy/addons/heapster/influxdb-svc.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: labels: - kubernetes.io/cluster-service: 'true' kubernetes.io/name: monitoring-influxdb kubernetes.io/minikube-addons: heapster name: monitoring-influxdb From 209cf8d4190efb05529d61bea95c54be33f31fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20D=C3=A9maret?= <59pilgrim@gmail.com> Date: Fri, 26 May 2017 11:57:34 +0200 Subject: [PATCH 2/3] Add correction --- deploy/addons/heapster/grafana-svc.yaml | 1 + deploy/addons/heapster/heapster-svc.yaml | 1 + deploy/addons/heapster/influxGrafana-rc.yaml | 2 +- deploy/addons/heapster/influxdb-svc.yaml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/addons/heapster/grafana-svc.yaml b/deploy/addons/heapster/grafana-svc.yaml index fba25a8c07..87903cce31 100644 --- a/deploy/addons/heapster/grafana-svc.yaml +++ b/deploy/addons/heapster/grafana-svc.yaml @@ -5,6 +5,7 @@ metadata: 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: diff --git a/deploy/addons/heapster/heapster-svc.yaml b/deploy/addons/heapster/heapster-svc.yaml index 7ea584a2ab..2b86ad4e01 100644 --- a/deploy/addons/heapster/heapster-svc.yaml +++ b/deploy/addons/heapster/heapster-svc.yaml @@ -4,6 +4,7 @@ metadata: labels: kubernetes.io/name: heapster kubernetes.io/minikube-addons: heapster + addonmanager.kubernetes.io/mode: Reconcile name: heapster namespace: kube-system spec: diff --git a/deploy/addons/heapster/influxGrafana-rc.yaml b/deploy/addons/heapster/influxGrafana-rc.yaml index 8a9baa1f55..34d7c73823 100644 --- a/deploy/addons/heapster/influxGrafana-rc.yaml +++ b/deploy/addons/heapster/influxGrafana-rc.yaml @@ -17,6 +17,7 @@ kind: ReplicationController metadata: labels: name: influxGrafana + addonmanager.kubernetes.io/mode: Reconcile kubernetes.io/minikube-addons: heapster name: influxdb-grafana namespace: kube-system @@ -25,7 +26,6 @@ spec: selector: addonmanager.kubernetes.io/mode: Reconcile name: influxGrafana - #name: influxdb-grafana template: metadata: labels: diff --git a/deploy/addons/heapster/influxdb-svc.yaml b/deploy/addons/heapster/influxdb-svc.yaml index cd2cfabd6e..f51a0c67d4 100644 --- a/deploy/addons/heapster/influxdb-svc.yaml +++ b/deploy/addons/heapster/influxdb-svc.yaml @@ -4,6 +4,7 @@ metadata: labels: kubernetes.io/name: monitoring-influxdb kubernetes.io/minikube-addons: heapster + addonmanager.kubernetes.io/mode: Reconcile name: monitoring-influxdb namespace: kube-system spec: From c94f41fbf1d0c32224eecdd210530e98767d541f Mon Sep 17 00:00:00 2001 From: Thibaut Demaret Date: Fri, 26 May 2017 21:23:28 +0200 Subject: [PATCH 3/3] the last reconcile --- deploy/addons/heapster/heapster-rc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/addons/heapster/heapster-rc.yaml b/deploy/addons/heapster/heapster-rc.yaml index d08e0a6a37..50f6b1ddfc 100644 --- a/deploy/addons/heapster/heapster-rc.yaml +++ b/deploy/addons/heapster/heapster-rc.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ReplicationController metadata: labels: + addonmanager.kubernetes.io/mode: Reconcile k8s-app: heapster name: heapster kubernetes.io/minikube-addons: heapster