From 84ad23d5e6f4f2b4cfab5bb1fe59582a6d91e5fb Mon Sep 17 00:00:00 2001 From: mksalawa Date: Thu, 1 Sep 2016 13:58:57 +0200 Subject: [PATCH 1/2] Bump heapster version to 1.2.0-beta.2 --- .../google/heapster-controller.yaml | 16 ++++++++-------- .../heapster-controller-combined.yaml | 16 ++++++++-------- .../influxdb/heapster-controller.yaml | 16 ++++++++-------- .../standalone/heapster-controller.yaml | 12 ++++++------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index b3337aa6fa0..c6d966ada0b 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -20,29 +20,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0-beta.1 + name: heapster-v1.2.0-beta.2 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 template: metadata: labels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster resources: # keep request = limit to keep this container in guaranteed class @@ -60,7 +60,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: eventer resources: # keep request = limit to keep this container in guaranteed class @@ -103,7 +103,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -132,7 +132,7 @@ spec: - --memory={{base_eventer_memory}} - --extra-memory={{eventer_memory_per_node}}Ki - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index 362f6109360..b7a7cbdc41e 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -20,29 +20,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0-beta.1 + name: heapster-v1.2.0-beta.2 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 template: metadata: labels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster resources: # keep request = limit to keep this container in guaranteed class @@ -61,7 +61,7 @@ spec: - name: ssl-certs mountPath: /etc/ssl/certs readOnly: true - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: eventer resources: # keep request = limit to keep this container in guaranteed class @@ -104,7 +104,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -133,7 +133,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index c0ab42d1aa8..8862df55156 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -20,29 +20,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0-beta.1 + name: heapster-v1.2.0-beta.2 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 template: metadata: labels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster resources: # keep request = limit to keep this container in guaranteed class @@ -56,7 +56,7 @@ spec: - /heapster - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: eventer resources: # keep request = limit to keep this container in guaranteed class @@ -95,7 +95,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -124,7 +124,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index 1df972156ea..a3bfe18b77e 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -16,29 +16,29 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.2.0-beta.1 + name: heapster-v1.2.0-beta.2 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 template: metadata: labels: k8s-app: heapster - version: v1.2.0-beta.1 + version: v1.2.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - - image: gcr.io/google_containers/heapster:v1.2.0-beta.1 + - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster resources: # keep request = limit to keep this container in guaranteed class @@ -76,7 +76,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.2.0-beta.1 + - --deployment=heapster-v1.2.0-beta.2 - --container=heapster - --poll-period=300000 - --estimator=exponential From 92c7feaf53862399297c2d019fea5a51f19cfeff Mon Sep 17 00:00:00 2001 From: mksalawa Date: Mon, 29 Aug 2016 15:48:50 +0200 Subject: [PATCH 2/2] Add liveness probe in controller configurations. --- .../cluster-monitoring/google/heapster-controller.yaml | 7 +++++++ .../googleinfluxdb/heapster-controller-combined.yaml | 7 +++++++ .../cluster-monitoring/influxdb/heapster-controller.yaml | 7 +++++++ .../cluster-monitoring/standalone/heapster-controller.yaml | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index c6d966ada0b..a6c643ba1de 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -44,6 +44,13 @@ spec: containers: - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster + livenessProbe: + httpGet: + path: /healthz + port: 8080 + scheme: HTTP + initialDelaySeconds: 180 + timeoutSeconds: 5 resources: # keep request = limit to keep this container in guaranteed class limits: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index b7a7cbdc41e..ea62e18ac48 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -44,6 +44,13 @@ spec: containers: - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster + livenessProbe: + httpGet: + path: /healthz + port: 8080 + scheme: HTTP + initialDelaySeconds: 180 + timeoutSeconds: 5 resources: # keep request = limit to keep this container in guaranteed class limits: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 8862df55156..fce29c5ba7e 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -44,6 +44,13 @@ spec: containers: - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster + livenessProbe: + httpGet: + path: /healthz + port: 8080 + scheme: HTTP + initialDelaySeconds: 180 + timeoutSeconds: 5 resources: # keep request = limit to keep this container in guaranteed class limits: diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index a3bfe18b77e..12f3eca11d4 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -40,6 +40,13 @@ spec: containers: - image: gcr.io/google_containers/heapster:v1.2.0-beta.2 name: heapster + livenessProbe: + httpGet: + path: /healthz + port: 8080 + scheme: HTTP + initialDelaySeconds: 180 + timeoutSeconds: 5 resources: # keep request = limit to keep this container in guaranteed class limits: