Merge pull request #35435 from Crassirostris/grafana-usage-update

Automatic merge from submit-queue Update grafana in kubernetes to version 3.1.1 Fix #33775 ```release-note Update grafana version used by default in kubernetes to 3.1.1 ``` @piosz

Merge pull request #35435 from Crassirostris/grafana-usage-update
9e50b284 · Kubernetes Submit Queue · GitHub · c3d104a3 · bb4ba53d · 9e50b284
Commit 9e50b284 authored Oct 24, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 24, 2016
Showing with 3 additions and 3 deletions

influxdb-grafana-controller.yaml ...ster-monitoring/influxdb/influxdb-grafana-controller.yaml +1 -1

influxdb-grafana-controller.yaml ...ster-monitoring/influxdb/influxdb-grafana-controller.yaml +2 -2

No files found.
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -36,7 +36,7 @@ spec:
          volumeMounts:
          - name: influxdb-persistent-storage
            mountPath: /data
-        - image: gcr.io/google_containers/heapster_grafana:v2.6.0-2
+        - image: gcr.io/google_containers/heapster_grafana:v3.1.1
          name: grafana
          env:
          resources:

--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -20,7 +20,7 @@ spec:
        kubernetes.io/cluster-service: "true"
    spec: 
      containers: 
-        - image: gcr.io/google_containers/heapster_influxdb:v0.5
+        - image: gcr.io/google_containers/heapster_influxdb:v0.7
          name: influxdb
          resources:
            # keep request = limit to keep this container in guaranteed class
@@ -36,7 +36,7 @@ spec:
          volumeMounts:
          - name: influxdb-persistent-storage
            mountPath: /data
-        - image: gcr.io/google_containers/heapster_grafana:v2.6.0-2
+        - image: gcr.io/google_containers/heapster_grafana:v3.1.1
          name: grafana
          env:
          resources: