add additional secrets support

common/unified-chart/templates/additional-secrets/resources.yaml

@@ -0,0 +1,3 @@
+{{- with .Values.additionalSecrets }}
+{{ tpl . $ }}
+{{- end }}

common/unified-chart/templates/web/web-deployment.yaml

@@ -34,12 +34,6 @@ spec:
       imagePullSecrets:
       {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.externalSecret.enabled }}
-      volumes:
-        - name: secret-volume
-          secret:
-            secretName: {{ include "secret.name" . }}
-      {{- end }}
       containers:
         - name: {{ include "container.name" . }}
           image: "{{ required ".Values.image.repository must be set" .Values.image.repository }}:{{ include "appVersion" . }}"
@@ -83,6 +77,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "name" . }}
+            {{- if .Values.additionalSecrets }}
+            - secretRef:
+                name: additional-{{ include "secret.name" . }}
+            {{- end }}
           {{- end }}
           resources:
             {{- toYaml .Values.web.resources | nindent 12 }}

common/unified-chart/values.yaml

@@ -333,3 +333,16 @@ additionalTemplates: |
 #   name: {{ include "fullname" $ }}-sa
 #   labels:
 #     {{- include "labels" $ | nindent 4 }}
+
+# additional helm templates to render external secrets and secret volumes
+additionalSecrets: |
+
+# ---
+# apiVersion: external-secrets.io/v1beta1
+# kind: ExternalSecret
+# metadata:
+#   name: {{ include "fullname" $ }}-ext
+#   annotations:
+#     argocd.argoproj.io/sync-options: ServerSideApply=true, Delete=false
+#   labels:
+#     {{- include "labels" $ | nindent 4 }}