From 04724b40b148af3465ab313476090cf9bfa7d86e Mon Sep 17 00:00:00 2001 From: st Date: Mon, 5 Feb 2024 11:50:17 +0100 Subject: [PATCH] fix(base-clsuter): replace backup.enabled condition --- .../base-cluster/templates/backup/migrations/velero-4-to-5.yaml | 2 +- .../monitoring/kube-prometheus-stack/_grafana-config.yaml | 2 +- charts/base-cluster/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml b/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml index eb9ebdbe6c..7174862b06 100644 --- a/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml +++ b/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.backup.enabled (hasPrefix "4." (dig "spec" "chart" "spec" "version" "" (lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "backup" "velero"))) }} +{{- if and .Values.backup.backupStorageLocations (hasPrefix "4." (dig "spec" "chart" "spec" "version" "" (lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "backup" "velero"))) }} apiVersion: batch/v1 kind: Job metadata: diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml index 47eabc5499..fe0d6a2d86 100644 --- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml +++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml @@ -120,7 +120,7 @@ dashboards: gnetId: 17813 revision: 2 {{- end }} - {{- if .Values.backup.enabled }} + {{- if .Values.backup.backupStorageLocations }} velero: <<: *dashboard gnetId: 11055 diff --git a/charts/base-cluster/values.yaml b/charts/base-cluster/values.yaml index 88a4ee5ba4..caf25a0532 100644 --- a/charts/base-cluster/values.yaml +++ b/charts/base-cluster/values.yaml @@ -56,7 +56,7 @@ global: app.kubernetes.io/component: storage app.kubernetes.io/part-of: nfs-server-provisioner backup: - condition: "{{ .Values.backup.enabled }}" + condition: "{{ .Values.backup.backupStorageLocations }}" additionalLabels: app.kubernetes.io/component: backup certificates: