Use tpl to render the persistence secret (#603)

apache · Jan 3, 2025 · 0f5850c · 0f5850c
1 parent 5064107
commit 0f5850c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/helm/polaris/templates/deployment.yaml b/helm/polaris/templates/deployment.yaml
@@ -135,7 +135,7 @@ spec:
           emptyDir: {}
         - name: secret-volume
           secret:
-            secretName: {{ .Values.persistenceConfigSecret }}
+            secretName: {{ tpl .Values.persistenceConfigSecret . }}
         {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector:

diff --git a/helm/polaris/templates/job.yaml b/helm/polaris/templates/job.yaml
@@ -103,7 +103,7 @@ spec:
           emptyDir: {}
         - name: secret-volume
           secret:
-            secretName: {{ .Values.persistenceConfigSecret }}
+            secretName: {{ tpl .Values.persistenceConfigSecret . }}
         {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector:

diff --git a/helm/polaris/tests/deployment_test.yaml b/helm/polaris/tests/deployment_test.yaml
@@ -399,6 +399,19 @@ tests:
           content:
             name: eclipselink-config-volume
             mountPath: /eclipselink-config
+  - it: should evaluate template expressions in persistence secret name
+    set:
+      persistenceConfigSecret: '{{ .Release.Name }}-persistence-secret'
+      polarisServerConfig:
+        metaStoreManager:
+          conf-file: /eclipselink-config/conf.jar!/persistence.xml
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: secret-volume
+            secret:
+              secretName: polaris-release-persistence-secret
 
   # spec.template.spec.containers[0].ports
   - it: should set container ports by default

diff --git a/helm/polaris/tests/job_test.yaml b/helm/polaris/tests/job_test.yaml
@@ -386,6 +386,20 @@ tests:
           content:
             name: eclipselink-config-volume
             mountPath: /eclipselink-config
+  - it: should evaluate template expressions in persistence secret name
+    set:
+      bootstrapMetastoreManager: true
+      persistenceConfigSecret: '{{ .Release.Name }}-persistence-secret'
+      polarisServerConfig:
+        metaStoreManager:
+          conf-file: /eclipselink-config/conf.jar!/persistence.xml
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: secret-volume
+            secret:
+              secretName: polaris-release-persistence-secret
 
   # spec.template.spec.containers[0].resources (with bootstrapMetastoreManager enabled)
   - it: should not set container resources by default