From 29273eba9c8c679b82fd6e2e1ce455a48ef06d12 Mon Sep 17 00:00:00 2001 From: Bort Verwilst Date: Tue, 15 Jan 2019 00:41:20 +0100 Subject: [PATCH] Update grafana dep version to 1.24 (#10613) Signed-off-by: Bart Verwilst --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 1 + stable/prometheus-operator/requirements.lock | 6 +++--- stable/prometheus-operator/requirements.yaml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 06593bd6e6..acf805369f 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 1.6.0 +version: 1.7.0 appVersion: 0.26.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index f16dccc8e0..914b67d630 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -225,6 +225,7 @@ The following tables lists the configurable parameters of the prometheus-operato | `grafana.sidecar.dashboards.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as dashboards | `grafana_dashboard` | | `grafana.sidecar.datasources.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.datasources.label }}=1` | `true` | | `grafana.sidecar.datasources.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as datasources configurations | `grafana_datasource` | +| `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` | ### Exporters | Parameter | Description | Default | diff --git a/stable/prometheus-operator/requirements.lock b/stable/prometheus-operator/requirements.lock index d0b9262161..e786ba1f3a 100644 --- a/stable/prometheus-operator/requirements.lock +++ b/stable/prometheus-operator/requirements.lock @@ -7,6 +7,6 @@ dependencies: version: 1.1.0 - name: grafana repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.19.1 -digest: sha256:e5a44a77570b8d95815a44fe20e60c6269b265624a5f09be81eb4f16a4e6843a -generated: 2018-12-31T18:30:11.81573+01:00 + version: 1.24.2 +digest: sha256:d7c161ede3f397ea69b587691ff66b259c9ff4cf4744dd88a02c8db442db986b +generated: 2019-01-14T16:40:33.892687423+01:00 diff --git a/stable/prometheus-operator/requirements.yaml b/stable/prometheus-operator/requirements.yaml index c3153d2816..1a25e12862 100644 --- a/stable/prometheus-operator/requirements.yaml +++ b/stable/prometheus-operator/requirements.yaml @@ -11,6 +11,6 @@ dependencies: condition: nodeExporter.enabled - name: grafana - version: 1.19.* + version: 1.24.* repository: https://kubernetes-charts.storage.googleapis.com/ condition: grafana.enabled