Skip to content

chore: Namespace the CSI Helm defined templates #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lfrancke wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

chore: Namespace the CSI Helm defined templates #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/helm/listener-operator/templates/_local_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion deploy/helm/listener-operator/templates/csi-node-driver-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/listener-operator/templates/csi-provisioner-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading