From a38204a498fbf6dd2281bda74eebf1402cea95b6 Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Tue, 9 Jun 2015 16:55:39 -0700 Subject: [PATCH] Update to heapster v0.14.0 --- .../google/heapster-controller.yaml | 12 ++++++------ .../cluster-monitoring/google/heapster-service.yaml | 13 +++++++++++++ .../influxdb/grafana-service.yaml | 2 +- .../influxdb/heapster-controller.yaml | 12 ++++++------ .../influxdb/heapster-service.yaml | 13 +++++++++++++ .../influxdb/influxdb-grafana-controller.yaml | 2 +- .../influxdb/influxdb-service.yaml | 2 +- test/e2e/monitoring.go | 4 ++-- 8 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 cluster/addons/cluster-monitoring/google/heapster-service.yaml create mode 100644 cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index ced723bcda2..a787389bf76 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -1,26 +1,26 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v1 + name: monitoring-heapster-v2 namespace: default labels: k8s-app: heapster - version: v1 + version: v2 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v1 + version: v2 template: metadata: labels: k8s-app: heapster - version: v1 + version: v2 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.13.0 + - image: gcr.io/google_containers/heapster:v0.14.0 name: heapster command: - /heapster diff --git a/cluster/addons/cluster-monitoring/google/heapster-service.yaml b/cluster/addons/cluster-monitoring/google/heapster-service.yaml new file mode 100644 index 00000000000..8ed8ff9a65f --- /dev/null +++ b/cluster/addons/cluster-monitoring/google/heapster-service.yaml @@ -0,0 +1,13 @@ +kind: Service +apiVersion: v1 +metadata: + name: monitoring-heapster + labels: + kubernetes.io/cluster-service: "true" + name: monitoring-heapster +spec: + ports: + - port: 80 + targetPort: 8082 + selector: + k8s-app: heapster diff --git a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml index 2c8b05e46a0..2df94a40751 100644 --- a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Service metadata: name: monitoring-grafana diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index f6d4e6ee58d..a57fd61138b 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -1,26 +1,26 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: - name: monitoring-heapster-v1 + name: monitoring-heapster-v2 namespace: default labels: k8s-app: heapster - version: v1 + version: v2 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: k8s-app: heapster - version: v1 + version: v2 template: metadata: labels: k8s-app: heapster - version: v1 + version: v2 kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/heapster:v0.13.0 + - image: gcr.io/google_containers/heapster:v0.14.0 name: heapster command: - /heapster diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml new file mode 100644 index 00000000000..8ed8ff9a65f --- /dev/null +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml @@ -0,0 +1,13 @@ +kind: Service +apiVersion: v1 +metadata: + name: monitoring-heapster + labels: + kubernetes.io/cluster-service: "true" + name: monitoring-heapster +spec: + ports: + - port: 80 + targetPort: 8082 + selector: + k8s-app: heapster diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml index 6e5ee253dcf..94d3dc06b2b 100644 --- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: name: monitoring-influx-grafana-v1 diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml index 344c0871516..b115086a2e4 100644 --- a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Service metadata: name: monitoring-influxdb diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 4561643944d..d1807c777bc 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -56,8 +56,8 @@ const ( influxdbDatabaseName = "k8s" influxdbUser = "root" influxdbPW = "root" - podlistQuery = "select distinct(pod_id) from /cpu.*/" - nodelistQuery = "select distinct(hostname) from /cpu.*/" + podlistQuery = "select distinct(pod_id) from \"cpu/usage_ns_cumulative\"" + nodelistQuery = "select distinct(hostname) from \"cpu/usage_ns_cumulative\"" sleepBetweenAttempts = 5 * time.Second testTimeout = 5 * time.Minute )