From 93e473346f2157f77d93a72b73f8a1b8cb9f6294 Mon Sep 17 00:00:00 2001
From: Lars Francke <jujutsu@lars-francke.de>
Date: Thu, 27 Aug 2026 22:38:06 +0200
Subject: [PATCH] chore: Namespace the CSI Helm defined templates The previous
 name could collide with the identically named thing in secret-operator. This
 could cause issues when used in an umbrella Chart.
 https://github.com/stackabletech/issues/issues/882

---
 deploy/helm/listener-operator/templates/_local_helpers.tpl    | 4 ++--
 .../templates/csi-node-driver-daemonset.yaml                  | 2 +-
 .../templates/csi-provisioner-deployment.yaml                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/helm/listener-operator/templates/_local_helpers.tpl b/deploy/helm/listener-operator/templates/_local_helpers.tpl
index 22a98422..b079b6bc 100644
--- a/deploy/helm/listener-operator/templates/_local_helpers.tpl
+++ b/deploy/helm/listener-operator/templates/_local_helpers.tpl
@@ -1,13 +1,13 @@
 {{/*
 Expand the image name for csi-provisioner
 */}}
-{{- define "csi-provisioner.image" -}}
+{{- define "listener-operator.csi-provisioner.image" -}}
 {{- printf "%s/csi-provisioner:%s" (.Values.csiProvisioner.externalProvisioner.image.repository | default (printf "%s/sig-storage" .Values.image.repository)) .Values.csiProvisioner.externalProvisioner.image.tag }}
 {{- end }}
 
 {{/*
 Expand the image name for csi-node-driver-registrar
 */}}
-{{- define "csi-node-driver-registrar.image" -}}
+{{- define "listener-operator.csi-node-driver-registrar.image" -}}
 {{- printf "%s/csi-node-driver-registrar:%s" (.Values.csiNodeDriver.nodeDriverRegistrar.image.repository | default (printf "%s/sig-storage" .Values.image.repository)) .Values.csiNodeDriver.nodeDriverRegistrar.image.tag }}
 {{- end }}
diff --git a/deploy/helm/listener-operator/templates/csi-node-driver-daemonset.yaml b/deploy/helm/listener-operator/templates/csi-node-driver-daemonset.yaml
index 1b5f2414..af5a79b2 100644
--- a/deploy/helm/listener-operator/templates/csi-node-driver-daemonset.yaml
+++ b/deploy/helm/listener-operator/templates/csi-node-driver-daemonset.yaml
@@ -92,7 +92,7 @@ spec:
             - name: mountpoint
               mountPath: {{ .Values.kubeletDir }}/pods
         - name: node-driver-registrar
-          image: "{{ include "csi-node-driver-registrar.image" . }}"
+          image: "{{ include "listener-operator.csi-node-driver-registrar.image" . }}"
           imagePullPolicy: {{ .Values.csiNodeDriver.nodeDriverRegistrar.image.pullPolicy }}
           resources:
             {{ .Values.csiNodeDriver.nodeDriverRegistrar.resources | toYaml | nindent 12 }}
diff --git a/deploy/helm/listener-operator/templates/csi-provisioner-deployment.yaml b/deploy/helm/listener-operator/templates/csi-provisioner-deployment.yaml
index 0e92e0be..da1725cb 100644
--- a/deploy/helm/listener-operator/templates/csi-provisioner-deployment.yaml
+++ b/deploy/helm/listener-operator/templates/csi-provisioner-deployment.yaml
@@ -98,7 +98,7 @@ spec:
             - name: csi
               mountPath: /csi
         - name: external-provisioner
-          image: "{{ include "csi-provisioner.image" . }}"
+          image: "{{ include "listener-operator.csi-provisioner.image" . }}"
           imagePullPolicy: {{ .Values.csiProvisioner.externalProvisioner.image.pullPolicy }}
           resources:
             {{ .Values.csiProvisioner.externalProvisioner.resources | toYaml | nindent 12 }}