From b36ae6efba99f13b173d5ac42519cb2f385be6ec Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Wed, 29 Jul 2015 16:13:33 -0700 Subject: [PATCH 1/2] Upgrading heapster to v0.17.0 --- .../cluster-monitoring/google/heapster-controller.yaml | 10 +++++----- .../googleinfluxdb/heapster-controller-combined.yaml | 10 +++++----- .../influxdb/heapster-controller.yaml | 10 +++++----- .../standalone/heapster-controller.yaml | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index dfa8495a971..406cdfbcdd5 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -1,26 +1,26 @@ apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v5 + name: monitoring-heapster-v6 namespace: kube-system labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v5 + version: v6 template: metadata: labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.16.0 + - image: gcr.io/google_containers/heapster:v0.17.0 name: heapster resources: limits: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index fcddb56ce41..b9123f157e7 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -1,26 +1,26 @@ apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v5 + name: monitoring-heapster-v6 namespace: kube-system labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v5 + version: v6 template: metadata: labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.16.0 + - image: gcr.io/google_containers/heapster:v0.17.0 name: heapster resources: limits: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index e58d7f9b3c2..320561290dd 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -1,26 +1,26 @@ apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v5 + name: monitoring-heapster-v6 namespace: kube-system labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v5 + version: v6 template: metadata: labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.16.0 + - image: gcr.io/google_containers/heapster:v0.17.0 name: heapster resources: limits: diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 584402df888..8a9598e5ddc 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -1,26 +1,26 @@ apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v5 + name: monitoring-heapster-v6 namespace: kube-system labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v5 + version: v6 template: metadata: labels: k8s-app: heapster - version: v5 + version: v6 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.16.0 + - image: gcr.io/google_containers/heapster:v0.17.0 name: heapster resources: limits: From c08ad6b7c1076e7a7f70aa9dd5774866bf59b406 Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Thu, 30 Jul 2015 10:45:26 -0700 Subject: [PATCH 2/2] Avoid mounting ssl volumes for heapster container. --- .../cluster-monitoring/google/heapster-controller.yaml | 8 -------- .../googleinfluxdb/heapster-controller-combined.yaml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 406cdfbcdd5..4c2a019bde5 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -33,11 +33,3 @@ spec: - --sink=gcl - --poll_duration=2m - --stats_resolution=1m - volumeMounts: - - name: ssl-certs - mountPath: /etc/ssl/certs - readOnly: true - volumes: - - name: ssl-certs - hostPath: - path: "/etc/ssl/certs" diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index b9123f157e7..9932e6e2f38 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -33,11 +33,3 @@ spec: - --sink=influxdb:http://monitoring-influxdb:8086 - --poll_duration=2m - --stats_resolution=1m - volumeMounts: - - name: ssl-certs - mountPath: /etc/ssl/certs - readOnly: true - volumes: - - name: ssl-certs - hostPath: - path: "/etc/ssl/certs"