Merge pull request #991 from mhutter/fix-grafana

fix(chart:k8up): Rename & implement grafanaDashboard.enabled

charts/k8up/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
   - backup
   - operator
   - restic
-version: 4.8.0
+version: 4.8.1
 sources:
   - https://github.com/k8up-io/k8up
 maintainers:

charts/k8up/README.md

@@ -1,6 +1,6 @@
 # k8up
 
-![Version: 4.8.0](https://img.shields.io/badge/Version-4.8.0-informational?style=flat-square)
+![Version: 4.8.1](https://img.shields.io/badge/Version-4.8.1-informational?style=flat-square)
 
 Kubernetes and OpenShift Backup Operator based on restic
 
@@ -13,7 +13,7 @@ helm repo add k8up-io https://k8up-io.github.io/k8up
 helm install k8up k8up-io/k8up
 ```
 ```bash
-kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-4.8.0/k8up-crd.yaml --server-side
+kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-4.8.1/k8up-crd.yaml --server-side
 ```
 
 <!---
@@ -63,7 +63,7 @@ Document your changes in values.yaml and let `make docs:helm` generate this sect
 | k8up.skipWithoutAnnotation | bool | `false` | Specifies whether K8up should ignore PVCs without the backup annotation (by default, `k8up.io/backup`) |
 | k8up.timezone | string | `""` | Specifies the timezone K8up is using for scheduling. Empty value defaults to the timezone in which Kubernetes is deployed. Accepts `tz database` compatible entries, e.g. `Europe/Zurich` |
 | metrics.grafanaDashboard.additionalLabels | object | `{}` | Add labels to the Grafana Dashboard object |
-| metrics.grafanaDashboard.enable | bool | `false` | Whether to deploy the Grafana dashboard |
+| metrics.grafanaDashboard.enabled | bool | `false` | Whether to deploy the Grafana dashboard |
 | metrics.grafanaDashboard.namespace | string | `""` | If the object should be installed in a different namespace than operator |
 | metrics.prometheusRule.additionalLabels | object | `{}` | Add labels to the PrometheusRule object |
 | metrics.prometheusRule.additionalRules | list | `[]` | Provide additional alert rules in addition to the defaults |

charts/k8up/templates/grafana-dashboard.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.metrics.grafanaDashboard.enabled -}}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -1204,3 +1205,4 @@ data:
       "weekStart": ""
     }
     `}}
+{{- end -}}

charts/k8up/values.yaml

@@ -129,7 +129,7 @@ metrics:
     additionalRules: []
   grafanaDashboard:
     # -- Whether to deploy the Grafana dashboard
-    enable: false
+    enabled: false
     # -- If the object should be installed in a different namespace than operator
     namespace: ""
     # -- Add labels to the Grafana Dashboard object