feat: add support for extra volumes and volume mounts in pods

charts/diode/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: diode
 description: A Helm chart for Diode
 type: application
-version: "1.10.0"
+version: "1.11.0"
 appVersion: "1.5.0"
 home: https://github.com/netboxlabs/diode
 sources:

charts/diode/README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for Diode
 
-![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square)
+![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square)
 
 ## Prerequisites
 
@@ -237,6 +237,8 @@ helm show values diode/diode
 | diodeAuth.enabled | bool | `true` | enabled |
 | diodeAuth.extraEnvs | string or list | `[]` | extra environment variables to be set on containers' `env` section |
 | diodeAuth.extraInitContainers | string or list | `""` | additional containers to run before auth finishes initializing (may contain templating instructions) |
+| diodeAuth.extraVolumeMounts | string or list | `[]` | additional volumes to mount in the container (may contain templating instructions) |
+| diodeAuth.extraVolumes | string or list | `[]` | additional volumes to define for the container (may contain templating instructions) |
 | diodeAuth.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
 | diodeAuth.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
 | diodeAuth.image.repository | string | `"docker.io/netboxlabs/diode-auth"` | image repository |
@@ -252,6 +254,8 @@ helm show values diode/diode
 | diodeAuthBootstrap.job.annotations | object | `{"helm.sh/hook":"post-install, post-upgrade","helm.sh/hook-weight":"2"}` | annotations to add to the auth bootstrap job |
 | diodeAuthBootstrap.job.backoffLimit | int | `20` | backoff limit |
 | diodeAuthBootstrap.job.extraInitContainers | string or list | `""` | additional initContainers to run during bootstrap (may contain templating instructions) |
+| diodeAuthBootstrap.job.extraVolumeMounts | string or list | `[]` | additional volumes to mount in the container (may contain templating instructions) |
+| diodeAuthBootstrap.job.extraVolumes | string or list | `[]` | additional volumes to define for the container (may contain templating instructions) |
 | diodeIngester.annotations | object | `{}` | annotations to add to the ingester deployment |
 | diodeIngester.config.loggingLevel | string | `"INFO"` | logging level |
 | diodeIngester.config.redisStreamDb | int | `1` | redis stream db |
@@ -264,6 +268,8 @@ helm show values diode/diode
 | diodeIngester.existingSecret | string | `"diode-ingester-secret"` | existing secret name |
 | diodeIngester.extraEnvs | string or list | `[]` | extra environment variables to be set on containers' `env` section |
 | diodeIngester.extraInitContainers | string or list | `""` | additional containers to run before the ingester finishes initializing (may contain templating instructions) |
+| diodeIngester.extraVolumeMounts | string or list | `[]` | additional volumes to mount in the container (may contain templating instructions) |
+| diodeIngester.extraVolumes | string or list | `[]` | additional volumes to define for the container (may contain templating instructions) |
 | diodeIngester.grpc.serviceName | string | `"diode.v1.IngesterService"` | grpc service name |
 | diodeIngester.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
 | diodeIngester.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
@@ -296,6 +302,8 @@ helm show values diode/diode
 | diodeReconciler.existingSecret | string | `"diode-reconciler-secret"` | existing secret name |
 | diodeReconciler.extraEnvs | string or list | `[]` | extra environment variables to be set on containers' `env` section |
 | diodeReconciler.extraInitContainers | string or list | `""` | additional containers to run before the reconciler finishes initializing (may contain templating instructions) |
+| diodeReconciler.extraVolumeMounts | string or list | `[]` | additional volumes to mount in the container (may contain templating instructions) |
+| diodeReconciler.extraVolumes | string or list | `[]` | additional volumes to define for the container (may contain templating instructions) |
 | diodeReconciler.grpc.serviceName | string | `"diode.v1.ReconcilerService"` | grpc service name |
 | diodeReconciler.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
 | diodeReconciler.image.pullPolicy | string | `"IfNotPresent"` | pull policy |

charts/diode/templates/diode-auth-bootstrap-job.yaml

@@ -58,10 +58,16 @@ spec:
             - name: HYDRA_ADMIN_URL
               value: {{ include "diode.hydra.admin.url" . }}
           volumeMounts:
+            {{- if .Values.diodeAuthBootstrap.job.extraVolumeMounts }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.diodeAuthBootstrap.job.extraVolumeMounts "context" $) | nindent 12 }}
+            {{- end }}
             - name: oauth2-secret
               mountPath: /etc/config/oauth2/client
               readOnly: true
       volumes:
+        {{- if .Values.diodeAuthBootstrap.job.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.diodeAuthBootstrap.job.extraVolumes "context" $) | nindent 8 }}
+        {{- end }}
         - name: oauth2-secret
           secret:
             secretName: {{ include "diode.auth.oauth2.secret" . }}

charts/diode/templates/diode-auth-deployment.yaml

@@ -78,4 +78,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "diode.auth.configmap" . }}
+          {{- if .Values.diodeAuth.extraVolumeMounts }}
+          volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.diodeAuth.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- end }}
+      {{- if .Values.diodeAuth.extraVolumes }}
+      volumes: {{- include "common.tplvalues.render" (dict "value" .Values.diodeAuth.extraVolumes "context" $) | nindent 8 }}
+      {{- end }}
 {{- end }} 

charts/diode/templates/diode-ingester-deployment.yaml

@@ -78,5 +78,10 @@ spec:
                 name: {{ include "diode.ingester.configmap" . }}
             - secretRef:
                 name: {{ include "diode.ingester.secret" . }}
-
+          {{- if .Values.diodeIngester.extraVolumeMounts }}
+          volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.diodeIngester.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- end }}
+      {{- if .Values.diodeIngester.extraVolumes }}
+      volumes: {{- include "common.tplvalues.render" (dict "value" .Values.diodeIngester.extraVolumes "context" $) | nindent 8 }}
+      {{- end }}
 {{- end }} 

charts/diode/templates/diode-reconciler-deployment.yaml

@@ -103,10 +103,16 @@ spec:
             - secretRef:
                 name: {{ include "diode.auth.oauth2.secret" . }}
           volumeMounts:
+            {{- if .Values.diodeReconciler.extraVolumeMounts }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.diodeReconciler.extraVolumeMounts "context" $) | nindent 12 }}
+            {{- end }}
             - name: oauth2-secret
               mountPath: /etc/config/oauth2/client
               readOnly: true
       volumes:
+        {{- if .Values.diodeReconciler.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.diodeReconciler.extraVolumes "context" $) | nindent 8 }}
+        {{- end }}
         - name: oauth2-secret
           secret:
             secretName: {{ include "diode.auth.oauth2.secret" . }}

charts/diode/values.yaml

@@ -103,6 +103,10 @@ diodeAuth:
   extraEnvs: []
   # -- (string or list) additional containers to run before auth finishes initializing (may contain templating instructions)
   extraInitContainers: ""
+  # -- (string or list) additional volumes to define for the container (may contain templating instructions)
+  extraVolumes: []
+  # -- (string or list) additional volumes to mount in the container (may contain templating instructions)
+  extraVolumeMounts: []
   # -- annotations to add to the auth deployment
   annotations: {}
   config:
@@ -139,6 +143,10 @@ diodeAuthBootstrap:
       "helm.sh/hook-weight": "2"
     # -- (string or list) additional initContainers to run during bootstrap (may contain templating instructions)
     extraInitContainers: ""
+    # -- (string or list) additional volumes to define for the container (may contain templating instructions)
+    extraVolumes: []
+    # -- (string or list) additional volumes to mount in the container (may contain templating instructions)
+    extraVolumeMounts: []
 
 # Diode Ingester configuration
 diodeIngester:
@@ -177,6 +185,10 @@ diodeIngester:
   extraEnvs: []
   # -- (string or list) additional containers to run before the ingester finishes initializing (may contain templating instructions)
   extraInitContainers: ""
+  # -- (string or list) additional volumes to define for the container (may contain templating instructions)
+  extraVolumes: []
+  # -- (string or list) additional volumes to mount in the container (may contain templating instructions)
+  extraVolumeMounts: []
   # -- annotations to add to the ingester deployment
   annotations: {}
   config:
@@ -230,6 +242,11 @@ diodeReconciler:
   extraEnvs: []
   # -- (string or list) additional containers to run before the reconciler finishes initializing (may contain templating instructions)
   extraInitContainers: ""
+  # -- (string or list) additional volumes to define for the container (may contain templating instructions)
+  extraVolumes: []
+  # -- (string or list) additional volumes to mount in the container (may contain templating instructions)
+  extraVolumeMounts: []
+  # -- annotations to add to the auth deployment
   # -- annotations to add to the reconciler deployment
   annotations: {}
   config: