projected volume

cryostatio · Dec 2, 2024 · 3f0dbc8 · 3f0dbc8
1 parent 871ae55
commit 3f0dbc8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/charts/cryostat/templates/cryostat_deployment.yaml b/charts/cryostat/templates/cryostat_deployment.yaml
@@ -141,10 +141,10 @@ spec:
             failureThreshold: 18
           resources:
             {{- toYaml .Values.core.resources | nindent 12 }}
+          {{- if .Values.core.config.eventTemplates.configMapNames}}
           volumeMounts:
-          {{- range .Values.core.config.eventTemplates.configMapNames }}
-            - name: {{ . }}
-              mountPath: /opt/cryostat.d/templates.d/{{ . }}
+            - name: declarative-event-templates
+              mountPath: /opt/cryostat.d/templates.d
               readOnly: true
           {{- end }}
         - name: {{ printf "%s-%s" .Chart.Name "grafana" }}
@@ -222,9 +222,11 @@ spec:
         secret:
           secretName: {{ .Release.Name }}-proxy-tls
       {{- end }}
-      {{- range .Values.core.config.eventTemplates.configMapNames}}
-      - name: {{ . }}
-        configMap:
-          name: {{ . }}
-          optional: false
-      {{- end }}
+      - name: declarative-event-templates
+        projected:
+          sources:
+            {{- range .Values.core.config.eventTemplates.configMapNames}}
+            - configMap:
+                name: {{ . }}
+                optional: false
+            {{- end }}
diff --git a/charts/cryostat/tests/cryostat_deployment_test.yaml b/charts/cryostat/tests/cryostat_deployment_test.yaml
@@ -523,23 +523,21 @@ tests:
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat')].volumeMounts
           value:
-            - name: a
-              mountPath: /opt/cryostat.d/templates.d/a
-              readOnly: true
-            - name: b
-              mountPath: /opt/cryostat.d/templates.d/b
+            - name: declarative-event-templates
+              mountPath: /opt/cryostat.d/templates.d
               readOnly: true
       - equal:
           path: spec.template.spec.volumes
           value:
             - name: alpha-config
               configMap:
                 name: RELEASE-NAME-alpha-config
-            - name: a
-              configMap:
-                name: a
-                optional: false
-            - name: b
-              configMap:
-                name: b
-                optional: false
+            - name: declarative-event-templates
+              projected:
+                sources:
+                  - configMap:
+                      name: a
+                      optional: false
+                  - configMap:
+                      name: b
+                      optional: false