From c17a462b0239230f8fb95c6d05bda01b14e3f5d5 Mon Sep 17 00:00:00 2001
From: Matt Pryor <matt@stackhpc.com>
Date: Fri, 21 Oct 2022 11:44:46 +0100
Subject: [PATCH] Ensure each addon has a unique component name

---
 .../templates/monitoring/kube-prometheus-stack.yaml           | 4 ++--
 charts/cluster-addons/templates/monitoring/loki-stack.yaml    | 4 ++--
 charts/cluster-addons/templates/openstack/csi-cinder.yaml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/cluster-addons/templates/monitoring/kube-prometheus-stack.yaml b/charts/cluster-addons/templates/monitoring/kube-prometheus-stack.yaml
index e48eff8..aeb9aec 100644
--- a/charts/cluster-addons/templates/monitoring/kube-prometheus-stack.yaml
+++ b/charts/cluster-addons/templates/monitoring/kube-prometheus-stack.yaml
@@ -30,8 +30,8 @@ spec:
 apiVersion: addons.stackhpc.com/v1alpha1
 kind: Manifests
 metadata:
-  name: {{ include "cluster-addons.componentName" (list . "kube-prometheus-stack") }}-dashboards
-  labels: {{ include "cluster-addons.componentLabels" (list . "kube-prometheus-stack") | nindent 4 }}
+  name: {{ include "cluster-addons.componentName" (list . "kube-prometheus-stack-dashboards") }}
+  labels: {{ include "cluster-addons.componentLabels" (list . "kube-prometheus-stack-dashboards") | nindent 4 }}
 spec:
   clusterName: {{ include "cluster-addons.clusterName" . }}
   bootstrap: true
diff --git a/charts/cluster-addons/templates/monitoring/loki-stack.yaml b/charts/cluster-addons/templates/monitoring/loki-stack.yaml
index 453b56a..12b565b 100644
--- a/charts/cluster-addons/templates/monitoring/loki-stack.yaml
+++ b/charts/cluster-addons/templates/monitoring/loki-stack.yaml
@@ -30,8 +30,8 @@ spec:
 apiVersion: addons.stackhpc.com/v1alpha1
 kind: Manifests
 metadata:
-  name: {{ include "cluster-addons.componentName" (list . "loki-stack") }}-dashboards
-  labels: {{ include "cluster-addons.componentLabels" (list . "loki-stack") | nindent 4 }}
+  name: {{ include "cluster-addons.componentName" (list . "loki-stack-dashboards") }}
+  labels: {{ include "cluster-addons.componentLabels" (list . "loki-stack-dashboards") | nindent 4 }}
 spec:
   clusterName: {{ include "cluster-addons.clusterName" . }}
   bootstrap: true
diff --git a/charts/cluster-addons/templates/openstack/csi-cinder.yaml b/charts/cluster-addons/templates/openstack/csi-cinder.yaml
index 7cbeba3..df6329c 100644
--- a/charts/cluster-addons/templates/openstack/csi-cinder.yaml
+++ b/charts/cluster-addons/templates/openstack/csi-cinder.yaml
@@ -57,8 +57,8 @@ spec:
 apiVersion: addons.stackhpc.com/v1alpha1
 kind: Manifests
 metadata:
-  name: {{ include "cluster-addons.componentName" (list . "csi-cinder") }}-storageclass
-  labels: {{ include "cluster-addons.componentLabels" (list . "csi-cinder") | nindent 4 }}
+  name: {{ include "cluster-addons.componentName" (list . "csi-cinder-storageclass") }}
+  labels: {{ include "cluster-addons.componentLabels" (list . "csi-cinder-storageclass") | nindent 4 }}
 spec:
   clusterName: {{ include "cluster-addons.clusterName" . }}
   bootstrap: true