feat: support envFrom in values file

Author: aabouzaid

README.md

@@ -167,6 +167,13 @@ main:
   #      postgresdb:
   #        password: 'big secret'
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+  #   - configMapRef:
+  #       name: n8n-config
+  #   - secretRef:
+  #       name: n8n-config
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv:
   #    N8N_DB_POSTGRESDB_NAME:
@@ -372,6 +379,9 @@ worker:
   # additional (to main) config for worker
   secret: {}
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv: {}
 
@@ -555,6 +565,9 @@ webhook:
   # additional (to main) config for webhook
   secret: {}
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv: {}
   #   WEBHOOK_URL:

charts/n8n/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: n8n
-version: 1.0.7
+version: 1.1.0
 appVersion: 1.85.1
 type: application
 description: "Helm Chart for deploying n8n on Kubernetes, a fair-code workflow automation platform with native AI capabilities for technical teams. Easily automate tasks across different services."
@@ -36,3 +36,4 @@ annotations:
   artifacthub.io/changes: |
     - kind: fixed
       description: "fix https://github.com/8gears/n8n-helm-chart/issues/176"
+

charts/n8n/templates/deployment.webhook.yaml

@@ -88,19 +88,21 @@ spec:
             - configMapRef:
                 name: {{ include "n8n.fullname" . }}-app-config
             {{- end }}
-           {{- if .Values.main.secret }}
+            {{- if .Values.main.secret }}
             - secretRef:
                 name: {{ include "n8n.fullname" . }}-app-secret
             {{- end }}
             {{- if .Values.webhook.config }}
             - configMapRef:
                 name: {{ include "n8n.fullname" . }}-webhook-config
             {{- end }}
-           {{- if .Values.webhook.secret }}
+            {{- if .Values.webhook.secret }}
             - secretRef:
                 name: {{ include "n8n.fullname" . }}-webhook-secret
             {{- end }}
-
+            {{- if .Values.webhook.extraEnvFrom }}
+              {{- toYaml .Values.webhook.extraEnvFrom | nindent 12 }}
+            {{- end }}
           env: {{ not (empty .Values.webhook.extraEnv) | ternary nil "[]" }}
             {{- range $key, $value := .Values.webhook.extraEnv }}
             - name: {{ $key }}

charts/n8n/templates/deployment.worker.yaml

@@ -63,18 +63,21 @@ spec:
             - configMapRef:
                 name: {{ include "n8n.fullname" . }}-app-config
             {{- end }}
-           {{- if .Values.main.secret }}
+            {{- if .Values.main.secret }}
             - secretRef:
                 name: {{ include "n8n.fullname" . }}-app-secret
             {{- end }}
             {{- if .Values.worker.config }}
             - configMapRef:
                 name: {{ include "n8n.fullname" . }}-worker-config
             {{- end }}
-           {{- if .Values.worker.secret }}
+            {{- if .Values.worker.secret }}
             - secretRef:
                 name: {{ include "n8n.fullname" . }}-worker-secret
             {{- end }}
+            {{- if .Values.worker.extraEnvFrom }}
+              {{- toYaml .Values.worker.extraEnvFrom | nindent 12 }}
+            {{- end }}
           env: {{ not (empty .Values.worker.extraEnv) | ternary nil "[]" }}
             {{- range $key, $value := .Values.worker.extraEnv }}
             - name: {{ $key }}

charts/n8n/templates/deployment.yaml

@@ -72,6 +72,9 @@ spec:
             - secretRef:
                 name: {{ include "n8n.fullname" . }}-app-secret
             {{- end }}
+            {{- if .Values.main.extraEnvFrom }}
+              {{- toYaml .Values.main.extraEnvFrom | nindent 12 }}
+            {{- end }}
           env: {{ not (empty .Values.main.extraEnv) | ternary nil "[]" }}
             {{- range $key, $value := .Values.main.extraEnv }}
             - name: {{ $key }}

charts/n8n/templates/service.yaml

@@ -1,4 +1,3 @@
-{{ if .Values.main.service.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,4 +18,3 @@ spec:
   selector:
     {{- include "n8n.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/type: master
-{{ end }}

charts/n8n/values.yaml

@@ -68,6 +68,13 @@ main:
   #      postgresdb:
   #        password: 'big secret'
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+  #   - configMapRef:
+  #       name: n8n-config
+  #   - secretRef:
+  #       name: n8n-config
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv:
   #    N8N_DB_POSTGRESDB_NAME:
@@ -230,7 +237,6 @@ main:
 
 
   service:
-    enabled: true
     annotations: {}
     # -- Service types allow you to specify what kind of Service you want.
     # E.g., ClusterIP, NodePort, LoadBalancer, ExternalName
@@ -274,6 +280,9 @@ worker:
   # additional (to main) config for worker
   secret: {}
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv: {}
 
@@ -457,6 +466,9 @@ webhook:
   # additional (to main) config for webhook
   secret: {}
 
+  # A list of environment variables to import from configMapRef or secretRef.
+  extraEnvFrom: []
+
   # Extra environmental variables, so you can reference other configmaps and secrets into n8n as env vars.
   extraEnv: {}
   #   WEBHOOK_URL: