From 98e599b40d578000b25aa3ed437f7806d27709ae Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Fri, 23 Jun 2017 14:35:14 +0200 Subject: [PATCH 1/2] Bumped Heapster to v1.4.0-beta.0 --- .../google/heapster-controller.yaml | 16 ++++++++-------- .../heapster-controller-combined.yaml | 16 ++++++++-------- .../influxdb/heapster-controller.yaml | 16 ++++++++-------- .../stackdriver/heapster-controller.yaml | 12 ++++++------ .../standalone/heapster-controller.yaml | 12 ++++++------ 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 0e81f2dac7c..989b5d30f85 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -23,29 +23,29 @@ metadata: apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0 + name: heapster-v1.4.0-beta.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0 + version: v1.4.0-beta.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: heapster livenessProbe: httpGet: @@ -65,7 +65,7 @@ spec: - name: usr-ca-certs mountPath: /usr/share/ca-certificates readOnly: true - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: eventer command: - /eventer @@ -103,7 +103,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --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.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --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 12b07734bf3..67535c4d4b1 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -23,29 +23,29 @@ metadata: apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0 + name: heapster-v1.4.0-beta.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0 + version: v1.4.0-beta.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: heapster livenessProbe: httpGet: @@ -66,7 +66,7 @@ spec: - name: usr-ca-certs mountPath: /usr/share/ca-certificates readOnly: true - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: eventer command: - /eventer @@ -104,7 +104,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --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.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --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 30b4c3290b5..0b5ac12087a 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -23,29 +23,29 @@ metadata: apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0 + name: heapster-v1.4.0-beta.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0 + version: v1.4.0-beta.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: heapster livenessProbe: httpGet: @@ -58,7 +58,7 @@ spec: - /heapster - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb:8086 - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: eventer command: - /eventer @@ -89,7 +89,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --container=heapster - --poll-period=300000 - --estimator=exponential @@ -118,7 +118,7 @@ spec: - --memory={{ base_eventer_memory }} - --extra-memory={{ eventer_memory_per_node }}Ki - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --container=eventer - --poll-period=300000 - --estimator=exponential diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml index 86cbbf911df..b41f1024d17 100644 --- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml @@ -21,29 +21,29 @@ metadata: apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0 + name: heapster-v1.4.0-beta.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0 + version: v1.4.0-beta.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: heapster livenessProbe: httpGet: @@ -89,7 +89,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{metrics_memory_per_node}}Mi - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --container=heapster - --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 06454ff4673..751d67bb047 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -21,29 +21,29 @@ metadata: apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: heapster-v1.3.0 + name: heapster-v1.4.0-beta.0 namespace: kube-system labels: k8s-app: heapster kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile - version: v1.3.0 + version: v1.4.0-beta.0 spec: replicas: 1 selector: matchLabels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 template: metadata: labels: k8s-app: heapster - version: v1.3.0 + version: v1.4.0-beta.0 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - - image: gcr.io/google_containers/heapster-amd64:v1.3.0 + - image: gcr.io/google_containers/heapster-amd64:v1.4.0-beta.0 name: heapster livenessProbe: httpGet: @@ -80,7 +80,7 @@ spec: - --memory={{ base_metrics_memory }} - --extra-memory={{ metrics_memory_per_node }}Mi - --threshold=5 - - --deployment=heapster-v1.3.0 + - --deployment=heapster-v1.4.0-beta.0 - --container=heapster - --poll-period=300000 - --estimator=exponential From 8d5d85e12607076d3b11c65b640acbc92f7c78a4 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Fri, 23 Jun 2017 21:43:17 +0200 Subject: [PATCH 2/2] Fixed Monitoring e2e test --- test/e2e/monitoring.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index e08974fa961..18128f09205 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() { const ( influxdbService = "monitoring-influxdb" influxdbDatabaseName = "k8s" - podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id" - nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname" + podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name" + nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename" sleepBetweenAttempts = 5 * time.Second testTimeout = 5 * time.Minute initializationTimeout = 5 * time.Minute @@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } // Do the same for all deployments. @@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } // And for pet sets. @@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if pod.DeletionTimestamp != nil { continue } - expectedPods = append(expectedPods, string(pod.UID)) + expectedPods = append(expectedPods, pod.Name) } } }