allow extra env, extra envFrom, extra InitContainers, and extra sidecars

charts/pixelfed/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.9.0
+version: 0.10.0
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed

charts/pixelfed/templates/deployment.yaml

@@ -33,7 +33,14 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.extraInitContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
+        {{- with .Values.extraContainers }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}
           securityContext:
@@ -45,10 +52,18 @@ spec:
             - name: http
               containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
+
           envFrom:
+            {{- with .Values.extraEnvFrom }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
             - configMapRef:
                 name: {{ include "pixelfed.fullname" . }}-env
           env:
+            {{- with .Values.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+
             # valkey AKA redis
             {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecretKeys.host }}
             - name: REDIS_HOST
@@ -104,6 +119,7 @@ spec:
                   name: {{ include "pixelfed.fullname" . }}-mail
                   key: host
                   {{- end }}
+
             - name: MAIL_PORT
               valueFrom:
                 secretKeyRef:
@@ -114,6 +130,7 @@ spec:
                   name: {{ include "pixelfed.fullname" . }}-mail
                   key: port
                   {{- end }}
+
             - name: MAIL_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -124,6 +141,7 @@ spec:
                   name: {{ include "pixelfed.fullname" . }}-mail
                   key: username
                   {{- end }}
+
             - name: MAIL_PASSWORD
               valueFrom:
                 secretKeyRef:

charts/pixelfed/values.yaml

@@ -26,6 +26,12 @@ fullnameOverride: ""
 # -- how many revisions of the deployment to keep for rollbacks
 revisionHistoryLimit: 10
 
+# -- template out extra environment variables from ConfigMaps or Secrets
+extraEnv: []
+
+# -- template out extra enviornment variables
+extraEnvFrom: []
+
 # This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
 serviceAccount:
   # -- Specifies whether a service account should be created
@@ -41,13 +47,16 @@ serviceAccount:
 # -- This is for setting Kubernetes Annotations to a Pod.
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 podAnnotations: {}
+
 # -- This is for setting Kubernetes Labels to a Pod.
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 podLabels: {}
 
+# -- securityContext for the whole pod
 podSecurityContext: {}
   # fsGroup: 2000
 
+# -- securityContext for the pixelfed container
 securityContext: {}
   # capabilities:
   #   drop:
@@ -129,10 +138,19 @@ volumeMounts: []
 #   mountPath: "/etc/foo"
 #   readOnly: true
 
+# -- set extra init containers
+extraInitContainers: []
+
+# -- set sidecar containers to run along side the pixelfed container
+extraContainers: []
+
+# -- put the pixelfed pod on a specific node/nodegroup
 nodeSelector: {}
 
+# -- set tolerations of node taints
 tolerations: []
 
+# -- set affinity to specific nodes or nodegroups
 affinity: {}
 
 externalDatabase: