Merge pull request #1286 from djcass44/main

Enable mounting of custom volumes to deployments

deploy/charts/external-secrets/templates/cert-controller-deployment.yaml

@@ -76,6 +76,14 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if .Values.certController.extraVolumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.certController.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+      {{- if .Values.certController.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.certController.extraVolumes | nindent 8 }}
+      {{- end }}
       {{- with .Values.certController.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/external-secrets/templates/deployment.yaml

@@ -89,6 +89,14 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if .Values.extraVolumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+      {{- if .Values.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/external-secrets/templates/webhook-deployment.yaml

@@ -83,10 +83,16 @@ spec:
           - name: certs
             mountPath: {{ .Values.webhook.certDir }}
             readOnly: true
+          {{- if .Values.webhook.extraVolumeMounts }}
+          {{- toYaml .Values.webhook.extraVolumeMounts | nindent 12 }}
+          {{- end }}
       volumes:
       - name: certs
         secret:
           secretName: {{ include "external-secrets.fullname" . }}-webhook
+      {{- if .Values.webhook.extraVolumes }}
+      {{- toYaml .Values.webhook.extraVolumes | nindent 8 }}
+      {{- end }}
       {{- with .Values.webhook.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/external-secrets/values.yaml

@@ -67,6 +67,12 @@ extraEnv: []
 ## -- Map of extra arguments to pass to container.
 extraArgs: {}
 
+## -- Extra volumes to pass to pod.
+extraVolumes: []
+
+## -- Extra volumes to mount to the container.
+extraVolumeMounts: []
+
 # -- Annotations to add to Deployment
 deploymentAnnotations: {}
 
@@ -197,6 +203,12 @@ webhook:
     ## -- Map of extra arguments to pass to container.
   extraArgs: {}
 
+    ## -- Extra volumes to pass to pod.
+  extraVolumes: []
+
+    ## -- Extra volumes to mount to the container.
+  extraVolumeMounts: []
+
     # -- Annotations to add to Secret
   secretAnnotations: {}
 
@@ -288,6 +300,12 @@ certController:
     ## -- Map of extra arguments to pass to container.
   extraArgs: {}
 
+    ## -- Extra volumes to pass to pod.
+  extraVolumes: []
+
+    ## -- Extra volumes to mount to the container.
+  extraVolumeMounts: []
+
     # -- Annotations to add to Deployment
   deploymentAnnotations: {}