Skip to content

Commit 0f5850c

Browse files
authored
Use tpl to render the persistence secret (#603)
1 parent 5064107 commit 0f5850c

File tree

4 files changed

+29
-2
lines changed

4 files changed

+29
-2
lines changed

helm/polaris/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ spec:
135135
emptyDir: {}
136136
- name: secret-volume
137137
secret:
138-
secretName: {{ .Values.persistenceConfigSecret }}
138+
secretName: {{ tpl .Values.persistenceConfigSecret . }}
139139
{{- end }}
140140
{{- if .Values.nodeSelector }}
141141
nodeSelector:

helm/polaris/templates/job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ spec:
103103
emptyDir: {}
104104
- name: secret-volume
105105
secret:
106-
secretName: {{ .Values.persistenceConfigSecret }}
106+
secretName: {{ tpl .Values.persistenceConfigSecret . }}
107107
{{- end }}
108108
{{- if .Values.nodeSelector }}
109109
nodeSelector:

helm/polaris/tests/deployment_test.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,19 @@ tests:
399399
content:
400400
name: eclipselink-config-volume
401401
mountPath: /eclipselink-config
402+
- it: should evaluate template expressions in persistence secret name
403+
set:
404+
persistenceConfigSecret: '{{ .Release.Name }}-persistence-secret'
405+
polarisServerConfig:
406+
metaStoreManager:
407+
conf-file: /eclipselink-config/conf.jar!/persistence.xml
408+
asserts:
409+
- contains:
410+
path: spec.template.spec.volumes
411+
content:
412+
name: secret-volume
413+
secret:
414+
secretName: polaris-release-persistence-secret
402415

403416
# spec.template.spec.containers[0].ports
404417
- it: should set container ports by default

helm/polaris/tests/job_test.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,20 @@ tests:
386386
content:
387387
name: eclipselink-config-volume
388388
mountPath: /eclipselink-config
389+
- it: should evaluate template expressions in persistence secret name
390+
set:
391+
bootstrapMetastoreManager: true
392+
persistenceConfigSecret: '{{ .Release.Name }}-persistence-secret'
393+
polarisServerConfig:
394+
metaStoreManager:
395+
conf-file: /eclipselink-config/conf.jar!/persistence.xml
396+
asserts:
397+
- contains:
398+
path: spec.template.spec.volumes
399+
content:
400+
name: secret-volume
401+
secret:
402+
secretName: polaris-release-persistence-secret
389403

390404
# spec.template.spec.containers[0].resources (with bootstrapMetastoreManager enabled)
391405
- it: should not set container resources by default

0 commit comments

Comments
 (0)