Merge "feat(barbican): allow users to provide configs in barbican.conf.d"

barbican/templates/deployment-api.yaml

@@ -25,6 +25,7 @@ httpGet:
 
 {{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }}
 {{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }}
+{{- $etcSources := .Values.pod.etcSources.barbican_api }}
 
 {{- $serviceAccountName := "barbican-api" }}
 {{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@@ -106,6 +107,9 @@ spec:
               mountPath: /etc/barbican/barbican.conf
               subPath: barbican.conf
               readOnly: true
+            - name: barbican-etc-snippets
+              mountPath: /etc/barbican/barbican.conf.d/
+              readOnly: true
             {{- if .Values.conf.barbican.DEFAULT.log_config_append }}
             - name: barbican-etc
               mountPath: {{ .Values.conf.barbican.DEFAULT.log_config_append }}
@@ -144,6 +148,14 @@ spec:
           secret:
             secretName: barbican-etc
             defaultMode: 0444
+        - name: barbican-etc-snippets
+{{- if $etcSources }}
+          projected:
+            sources:
+{{ toYaml $etcSources | indent 14 }}
+{{- else }}
+          emptyDir: {}
+{{ end }}
         - name: barbican-bin
           configMap:
             name: barbican-bin

barbican/values.yaml

@@ -108,6 +108,12 @@ pod:
       barbican_db_sync:
         volumeMounts:
         volumes:
+  # -- This allows users to add Kubernetes Projected Volumes to be mounted at /etc/barbican/barbican.conf.d/
+  ## This is a list of projected volume source objects for each deployment/statefulset/daemonset/cronjob
+  ## https://kubernetes.io/docs/concepts/storage/projected-volumes/
+  etcSources:
+    barbican_api: []
+    barbican_db_sync: []
   replicas:
     api: 1
   lifecycle:

releasenotes/notes/barbican-669168de73ab5847.yaml

@@ -0,0 +1,7 @@
+---
+barbican:
+  - |
+    Allow users to add additional sources to the Projected Volume that is mounted
+    at /etc/barbican/barbican.conf.d/ so they may more easily override configs or provide
+    additional configs for the various services in the chart.
+...