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 }}