[stable/prometheus-operator] Update grafana to 3.12.1. (#18161)

Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
This commit is contained in:
Cédric de Saint Martin
2019-10-29 01:48:43 -07:00
committed by Kubernetes Prow Robot
parent 7dbbfcf002
commit 8466440df3
4 changed files with 13 additions and 9 deletions
+2 -1
View File
@@ -10,8 +10,9 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 6.21.1
version: 7.0.0
appVersion: 0.32.0
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
keywords:
- operator
+7 -4
View File
@@ -95,10 +95,13 @@ kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/ma
$ helm install --name my-release stable/prometheus-operator --set prometheusOperator.createCustomResource=false
```
### Helm <2.10 workaround
The `crd-install` hook is required to deploy the prometheus operator CRDs before they are used. If you are forced to use an earlier version of Helm you can work around this requirement as follows:
1. Install prometheus-operator by itself, disabling everything but the prometheus-operator component, and also setting `prometheusOperator.serviceMonitor.selfMonitor=false`
2. Install all the other components, and configure `prometheus.additionalServiceMonitors` to scrape the prometheus-operator service.
## Upgrading an existing Release to a new major version
A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
incompatible breaking change needing manual actions.
### Upgrading from 6.x.x to 7.x.x
Due to a change in grafana subchart, version 7.x.x now requires Helm >= 2.12.0.
### Upgrading from 5.x.x to 6.x.x
Due to a change in deployment labels of kube-state-metrics, the upgrade requires `helm upgrade --force` in order to re-create the deployment. If this is not done an error will occur indicating that the deployment cannot be modified:
+3 -3
View File
@@ -7,6 +7,6 @@ dependencies:
version: 1.7.0
- name: grafana
repository: https://kubernetes-charts.storage.googleapis.com/
version: 3.10.2
digest: sha256:76bdb624ab8850dce9fc50f299c7f959fe8e318895754b3e8fb86dd322205783
generated: "2019-10-17T20:33:18.516405134+03:00"
version: 4.0.0
digest: sha256:5d90eb0f1ffd7a9af82660bb0eec0e2982b58a86800f5c02613623be5b66189a
generated: "2019-10-24T09:30:17.277523+02:00"
+1 -1
View File
@@ -11,6 +11,6 @@ dependencies:
condition: nodeExporter.enabled
- name: grafana
version: 3.10.*
version: 4.0.*
repository: https://kubernetes-charts.storage.googleapis.com/
condition: grafana.enabled