github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/6/head
Kubernetes Submit Queue 2016-10-24 13:38:07 -07:00 committed by GitHub
parent c3d104a38f bb4ba53de2
commit 9e50b284af
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -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:

4
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -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: