Skip to content

Commit b6d0201

Browse files
committed
name prefix, weird templating behavior
1 parent a2e2c83 commit b6d0201

5 files changed

Lines changed: 12 additions & 13 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
{{- define "certificates.env.python" -}}
1+
{{- define "csiRcloneCertificates.env.python" -}}
22
- name: REQUESTS_CA_BUNDLE
33
value: /etc/ssl/certs/ca-certificates.crt
44
- name: SSL_CERT_FILE
55
value: /etc/ssl/certs/ca-certificates.crt
66
{{- end -}}
77

8-
{{- define "certificates.env.grpc" -}}
8+
{{- define "csiRcloneCertificates.env.grpc" -}}
99
- name: GRPC_DEFAULT_SSL_ROOTS_FILE_PATH
1010
value: /etc/ssl/certs/ca-certificates.crt
1111
{{- end -}}
1212

13-
{{- define "certificates.env.nodejs" -}}
13+
{{- define "csiRcloneCertificates.env.nodejs" -}}
1414
- name: NODE_EXTRA_CA_CERTS
1515
value: /etc/ssl/certs/ca-certificates.crt
1616
{{- end -}}

deploy/csi-rclone/templates/_certificates-init-container.tpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
{{- define "certificates.initContainer" -}}
1+
{{- define "csiRcloneCertificates.initContainer" -}}
22
{{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
33
{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
4-
54
- name: init-certificates
65
image: "{{ .Values.csiNodepluginRclone.certificates.image.repository }}:{{ .Values.csiNodepluginRclone.certificates.image.tag }}"
76
securityContext:

deploy/csi-rclone/templates/_certificates-volume-mounts.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
{{- define "certificates.volumeMounts.system" -}}
1+
{{- define "csiRcloneCertificates.volumeMounts.system" -}}
22
- name: etc-ssl-certs
33
mountPath: /etc/ssl/certs/
44
readOnly: true
55
{{- end -}}
66

7-
{{- define "certificates.volumeMounts.openjdk14" -}}
7+
{{- define "csiRcloneCertificates.volumeMounts.openjdk14" -}}
88
- name: etc-ssl-certs
99
mountPath: /opt/openjdk-14/lib/security/cacerts
1010
subPath: java/cacerts
1111
readOnly: true
1212
{{- end -}}
1313

14-
{{- define "certificates.volumeMounts.javaCertsGeneral" -}}
14+
{{- define "csiRcloneCertificates.volumeMounts.javaCertsGeneral" -}}
1515
- name: etc-ssl-certs
1616
mountPath: /etc/ssl/certs/java/cacerts
1717
subPath: java/cacerts
1818
readOnly: true
1919
{{- end -}}
2020

21-
{{- define "certificates.volumeMounts.openjdk17" -}}
21+
{{- define "csiRcloneCertificates.volumeMounts.openjdk17" -}}
2222
- name: etc-ssl-certs
2323
mountPath: /opt/java/openjdk/lib/security/cacerts
2424
subPath: java/cacerts

deploy/csi-rclone/templates/_certificates-volumes.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- define "certificatesForMounts.volumes" -}}
1+
{{- define "csiRcloneCertificatesForMounts.volumes" -}}
22
{{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
33
{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
44
- name: etc-ssl-certs

deploy/csi-rclone/templates/csi-nodeplugin-rclone.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccountName: {{ include "chart.fullname" . }}-nodeplugin
2222
dnsPolicy: ClusterFirstWithHostNet
2323
initContainers:
24-
{{- include "certificates.initContainer" . | nindent 8 }}
24+
{{- include "csiRcloneCertificates.initContainer" . | nindent 8 }}
2525
containers:
2626
- name: node-driver-registrar
2727
args:
@@ -145,7 +145,7 @@ spec:
145145
name: pods-mount-dir
146146
- mountPath: /var/lib/rclone
147147
name: cache-dir
148-
{{- include "certificates.volumeMounts.system" . | nindent 8 }}
148+
{{- include "csiRcloneCertificates.volumeMounts.system" . | nindent 8 }}
149149
{{- with .Values.csiNodepluginRclone.nodeSelector }}
150150
nodeSelector:
151151
{{ toYaml . | nindent 8 }}
@@ -173,4 +173,4 @@ spec:
173173
name: registration-dir
174174
- name: cache-dir
175175
emptyDir: {}
176-
{{- include "certificatesForMounts.volumes" . | nindent 6 }}
176+
{{- include "csiRcloneCertificatesForMounts.volumes" . | nindent 6 }}

0 commit comments

Comments
 (0)