From 8466440df39f510a067ea45cd7c13eb8f87b5208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Tue, 29 Oct 2019 09:48:43 +0100 Subject: [PATCH] [stable/prometheus-operator] Update grafana to 3.12.1. (#18161) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric de Saint Martin --- stable/prometheus-operator/Chart.yaml | 3 ++- stable/prometheus-operator/README.md | 11 +++++++---- stable/prometheus-operator/requirements.lock | 6 +++--- stable/prometheus-operator/requirements.yaml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 20b17d884f..f644795132 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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 diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 069c8aed47..33df8ddc6f 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -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: diff --git a/stable/prometheus-operator/requirements.lock b/stable/prometheus-operator/requirements.lock index 0f271112c0..9af93f3aae 100644 --- a/stable/prometheus-operator/requirements.lock +++ b/stable/prometheus-operator/requirements.lock @@ -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" diff --git a/stable/prometheus-operator/requirements.yaml b/stable/prometheus-operator/requirements.yaml index db2d85acdb..f84be4331d 100644 --- a/stable/prometheus-operator/requirements.yaml +++ b/stable/prometheus-operator/requirements.yaml @@ -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