Add N8N_PROTOCOL

.drone.yml

@@ -32,6 +32,7 @@ steps:
     image: cr.grachevko.ru/docker.io/alpine/helm:latest
     pull: always
     commands:
+      - helm repo add bitnami https://charts.bitnami.com/bitnami
       - helm dependency build
       - helm plugin install https://github.com/chartmuseum/helm-push
       - helm repo add $HELM_REPO_NAME $HELM_REPO_REGISTRY/$HELM_REPO_NAME --username $HELM_REPO_USERNAME --password $HELM_REPO_PASSWORD

.helmignore

@@ -21,4 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-*.tgz

Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: redis
+  repository: https://charts.bitnami.com/bitnami
+  version: 17.3.11
+digest: sha256:40f0dad12458b527f362dd152bbeb042a415b0bb48376357901d2062489b0650
+generated: "2022-11-16T12:29:15.310122534+03:00"

Chart.yaml

@@ -3,7 +3,7 @@ name: n8n
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.1
-appVersion: v0.202.1
+appVersion: 0.202.1
 icon: https://github.com/n8n-io/n8n/raw/master/assets/n8n-logo.png
 maintainers:
   - email: me@grachevko.ru
@@ -12,7 +12,6 @@ sources:
   - https://git.grachevko.ru/n8n/chart
 dependencies:
   - name: redis
-    version: ~16.4.0
+    version: ^17
     repository: https://charts.bitnami.com/bitnami
-    alias: redis
     condition: redis.enabled

TODO.md

@@ -0,0 +1 @@
+- [ ] external redis config

templates/configmap.yaml

@@ -1,21 +1,25 @@
 {{- if not .Values.existingSecret }}
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ include "n8n.fullname" . }}
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
-type: Opaque
 data:
-  NODE_ENV: {{ .Values.config.node_env | quote }}
+  N8N_HOST: {{ .Values.config.host | quote }}
+  N8N_PORT: {{ .Values.config.port | quote }}
+  N8N_PROTOCOL: {{ .Values.config.protocol | quote }}
   WEBHOOK_URL: {{ .Values.config.webhook_url | quote }}
   EXECUTIONS_MODE: "queue"
   EXECUTIONS_PROCESS: {{ .Values.config.executions.process | quote }}
   GENERIC_TIMEZONE: {{ .Values.config.timezone | quote }}
   EXECUTIONS_DATA_PRUNE: {{ .Values.config.executions.data.prune | quote }}
   EXECUTIONS_DATA_MAX_AGE: {{ .Values.config.executions.data.max_age | quote }}
-  N8N_DIAGNOSTICS_ENABLED: {{ .Values.config.executions.data.max_age | quote }}
+  N8N_DIAGNOSTICS_ENABLED: {{ .Values.config.diagnostics.enabled | quote }}
   NODE_FUNCTION_ALLOW_BUILTIN: {{ .Values.config.node.function.allow.builtin | quote }}
   NODE_FUNCTION_ALLOW_EXTERNAL: {{ .Values.config.node.function.allow.external | quote }}
-  QUEUE_BULL_REDIS_HOST: {{ include "n8n.fullname" . }}-redis
+  QUEUE_BULL_REDIS_HOST: {{ include "n8n.fullname" . }}-redis-master
+  {{- if .Values.config.debug }}
+  N8N_LOG_LEVEL: debug
+  {{- end }}
 {{- end }}

templates/n8n-deployment.yaml

@@ -4,6 +4,9 @@ metadata:
   name: {{ include "n8n.fullname" . }}
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
+  annotations:
+    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
 spec:
   replicas: 1
   selector:
@@ -32,8 +35,7 @@ spec:
           imagePullPolicy: {{ .Values.n8n.image.pullPolicy }}
           envFrom:
             - configMapRef:
-                - name: {{ include "n8n.fullname" . }}
+                name: {{ include "n8n.fullname" . }}
-          envFrom:
           {{- if .Values.n8n.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.n8n.extraEnvVarsSecret }}
@@ -50,6 +52,12 @@ spec:
             httpGet:
               path: /healthz
               port: http
+          startupProbe:
+            httpGet:
+              path: /healthz
+              port: http
+            failureThreshold: 30
+            periodSeconds: 10
           resources:
             {{- toYaml .Values.n8n.resources | nindent 12 }}
       {{- with .Values.n8n.nodeSelector }}

templates/webhook-deployment.yaml

@@ -4,6 +4,9 @@ metadata:
   name: {{ include "n8n.fullname" . }}-webhook
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
+  annotations:
+    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
 spec:
   {{- if not .Values.webhook.autoscaling.enabled }}
   replicas: {{ .Values.webhook.replicaCount }}
@@ -32,10 +35,12 @@ spec:
             {{- toYaml .Values.webhook.securityContext | nindent 12 }}
           image: "{{ .Values.webhook.image.registry }}/{{ .Values.webhook.image.repository }}:{{ .Values.webhook.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
+          command:
+            - n8n
+            - webhook
           envFrom:
             - configMapRef:
-                - name: {{ include "n8n.fullname" . }}
+                name: {{ include "n8n.fullname" . }}
-          envFrom:
           {{- if .Values.webhook.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.webhook.extraEnvVarsSecret }}

templates/worker-deployment.yaml

@@ -4,6 +4,9 @@ metadata:
   name: {{ include "n8n.fullname" . }}-worker
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
+  annotations:
+    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
 spec:
   {{- if not .Values.worker.autoscaling.enabled }}
   replicas: {{ .Values.worker.replicaCount }}
@@ -32,10 +35,12 @@ spec:
             {{- toYaml .Values.worker.securityContext | nindent 12 }}
           image: "{{ .Values.worker.image.registry }}/{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
+          command:
+            - n8n
+            - worker
           envFrom:
             - configMapRef:
-                - name: {{ include "n8n.fullname" . }}
+                name: {{ include "n8n.fullname" . }}
-          envFrom:
           {{- if .Values.worker.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.worker.extraEnvVarsSecret }}

values.yaml

@@ -1,4 +1,8 @@
 config:
+  host: ""
+  port: "5678"
+  protocol: http
+  debug: false
   db_type: postgresdb
   postgres:
     database: n8n
@@ -10,20 +14,25 @@ config:
   encryption_key: ""
   timezone: Europe/Moscow
   webhook_url: ""
-  node_env: production
   executions:
     process: main
     data:
-      prune: 'true'
+      prune: true
       max_age: 8760
   diagnostics:
-    enabled: 'false'
+    enabled: false
   node:
     function:
       allow:
         builtin: '*'
         external: '*'
 
+redis:
+  enabled: false
+  architecture: standalone
+  auth:
+    enabled: false
+
 existingSecret: ""
 
 nameOverride: ""