From 9fb51c685e89040da21b7631d3389b74aa7c6cc0 Mon Sep 17 00:00:00 2001
From: Elias Lindkvist <elias.lindkvist@elastisys.com>
Date: Thu, 17 Oct 2024 08:34:22 +0200
Subject: [PATCH] keep old naming

---
 .../values/grafana/grafana-user.yaml.gotmpl   |  4 ++
 migration/v0.42/apply/10-upgrade-grafana.sh   | 47 ++++++++++---------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/helmfile.d/values/grafana/grafana-user.yaml.gotmpl b/helmfile.d/values/grafana/grafana-user.yaml.gotmpl
index fe9cba588..9d5c7702c 100644
--- a/helmfile.d/values/grafana/grafana-user.yaml.gotmpl
+++ b/helmfile.d/values/grafana/grafana-user.yaml.gotmpl
@@ -61,7 +61,11 @@ datasources:
       Otherwise set the name of the clusters so users know what they are looking at.
       */}}
     {{- with first .Values.global.clustersMonitoring }}
+    {{- if eq (len $.Values.global.clustersMonitoring) 1 }}
+    - name: "Workload Cluster"
+    {{- else }}
     - name: "Workload Cluster {{ . }}"
+    {{- end }}
       access: proxy
       basicAuth: false
       editable: false
diff --git a/migration/v0.42/apply/10-upgrade-grafana.sh b/migration/v0.42/apply/10-upgrade-grafana.sh
index e79f37157..4e691b951 100755
--- a/migration/v0.42/apply/10-upgrade-grafana.sh
+++ b/migration/v0.42/apply/10-upgrade-grafana.sh
@@ -24,29 +24,30 @@ run() {
       helmfile_apply sc app=grafana
       kubectl_do sc wait pod -n monitoring --for=condition=ready -l app.kubernetes.io/instance=user-grafana --timeout=120s
 
-      clusters_monitoring=$(yq4 '[.global.clustersMonitoring[] | {"name": .}]' "${CK8S_CONFIG_PATH}/sc-config.yaml" -ojson)
-      export clusters_monitoring
-
-      user_grafana_cm=$(kubectl_do sc get cm user-grafana -n monitoring -o=jsonpath='{.data.datasources\.yaml}' \
-        | yq4 '.deleteDatasources = [{"name": "Workload Cluster", "org": 1}]' \
-        | yq4 '.deleteDatasources += env(clusters_monitoring)' -o json)
-
-      PATCH="[
-        {
-          'op': 'replace',
-          'path': '/data/datasources.yaml',
-          'value': '${user_grafana_cm}'
-        }
-      ]"
-      kubectl_do sc patch cm user-grafana -n monitoring --type json --patch "${PATCH}"
-      kubectl_do sc rollout restart deployment user-grafana -n monitoring
-      kubectl_do sc rollout status deployment user-grafana -n monitoring
-
-      kubectl_do sc delete configmap user-grafana -n monitoring
-      helmfile_do sc -l name=user-grafana sync
-
-      kubectl_do sc rollout restart deployment user-grafana -n monitoring
-      kubectl_do sc rollout status deployment user-grafana -n monitoring
+      if [[ $(yq4 '.global.clustersMonitoring | length' "${CK8S_CONFIG_PATH}/sc-config.yaml") -gt 1 ]]; then
+        clusters_monitoring=$(yq4 '[.global.clustersMonitoring[] | {"name": .}]' "${CK8S_CONFIG_PATH}/sc-config.yaml" -ojson)
+        export clusters_monitoring
+
+        user_grafana_cm=$(kubectl_do sc get cm user-grafana -n monitoring -o=jsonpath='{.data.datasources\.yaml}' \
+          | yq4 '.deleteDatasources += env(clusters_monitoring)' -o json)
+
+        PATCH="[
+          {
+            'op': 'replace',
+            'path': '/data/datasources.yaml',
+            'value': '${user_grafana_cm}'
+          }
+        ]"
+        kubectl_do sc patch cm user-grafana -n monitoring --type json --patch "${PATCH}"
+        kubectl_do sc rollout restart deployment user-grafana -n monitoring
+        kubectl_do sc rollout status deployment user-grafana -n monitoring
+
+        kubectl_do sc delete configmap user-grafana -n monitoring
+        helmfile_do sc -l name=user-grafana sync
+
+        kubectl_do sc rollout restart deployment user-grafana -n monitoring
+        kubectl_do sc rollout status deployment user-grafana -n monitoring
+      fi
     fi
     ;;
   rollback)