Skip to content

K
k3s
Commit 9e50b284 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents c3d104a3 bb4ba53d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View file @ 9e50b284
...@@ -36,7 +36,7 @@ spec: ...@@ -36,7 +36,7 @@ spec:
volumeMounts: volumeMounts:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data 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 name: grafana
env: env:
resources: resources:
......
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View file @ 9e50b284
...@@ -20,7 +20,7 @@ spec: ...@@ -20,7 +20,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.5 - image: gcr.io/google_containers/heapster_influxdb:v0.7
name: influxdb name: influxdb
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
...@@ -36,7 +36,7 @@ spec: ...@@ -36,7 +36,7 @@ spec:
volumeMounts: volumeMounts:
- name: influxdb-persistent-storage - name: influxdb-persistent-storage
mountPath: /data 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 name: grafana
env: env:
resources: resources:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment