Skip to content

Commit 6b9d41e

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

3 files changed

Lines changed: 8 additions & 9 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

0 commit comments

Comments
 (0)