ci: use helm plugin

This reverts commit 92f8d4442c.

.drone.yml

@@ -6,45 +6,18 @@ name: default
 trigger:
   event:
     - push
-    - tag
 
 steps:
-  - name: lint
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
-    pull: always
-    commands:
-      - helm lint .
-
-  - name: version
-    image: cr.grachevko.ru/docker.io/mikefarah/yq:latest
-    pull: always
-    user: root
-    commands:
-      - yq -i '.version = "'$DRONE_TAG'"' Chart.yaml
-      - cat Chart.yaml
-    depends_on:
-      - lint
-    when:
-      event:
-        - tag
-
   - name: release
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
-    pull: always
-    commands:
-      - 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
-      - helm cm-push . $HELM_REPO_REGISTRY/$HELM_REPO_NAME
-    environment:
-      HELM_REPO_NAME: n8n
-      HELM_REPO_REGISTRY: https://harbor.grachevko.ru/chartrepo
-      HELM_REPO_USERNAME:
+    image: cr.grachevko.ru/drone/helm:0.1.4
+    settings:
+      name: n8n
+      registry: https://harbor.grachevko.ru/chartrepo
+      username:
         from_secret: HELM_REPO_USERNAME
-      HELM_REPO_PASSWORD:
+      password:
         from_secret: HELM_REPO_PASSWORD
-    depends_on:
-      - version
     when:
-      event:
-        - tag
+      branch:
+        - master
+        - rc

.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,5 +3,15 @@ name: n8n
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.1
-appVersion: v0.202.1
+appVersion: 0.215.1
 icon: https://github.com/n8n-io/n8n/raw/master/assets/n8n-logo.png
+maintainers:
+  - email: me@grachevko.ru
+    name: Konstantin Grachev
+sources:
+  - https://git.grachevko.ru/n8n/chart
+dependencies:
+  - name: redis
+    version: ^17
+    repository: https://charts.bitnami.com/bitnami
+    condition: redis.enabled

TODO.md

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

templates/_helpers.tpl

@@ -5,6 +5,14 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{- define "n8n-webhook.name" -}}
+{{ include "n8n.name" . }}-webhook
+{{- end }}
+
+{{- define "n8n-worker.name" -}}
+{{ include "n8n.name" . }}-worker
+{{- end }}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -23,6 +31,14 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{- define "n8n-webhook.fullname" -}}
+{{ include "n8n.fullname" . }}-webhook
+{{- end }}
+
+{{- define "n8n-worker.fullname" -}}
+{{ include "n8n.fullname" . }}-worker
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -33,15 +49,32 @@ Create chart name and version as used by the chart label.
 {{/*
 Common labels
 */}}
-{{- define "n8n.labels" -}}
+{{- define "common.labels" -}}
 helm.sh/chart: {{ include "n8n.chart" . }}
-{{ include "n8n.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/*
+n8n labels
+*/}}
+{{- define "n8n.labels" -}}
+{{ include "common.labels" . }}
+{{ include "n8n.selectorLabels" . }}
+{{- end }}
+
+{{- define "n8n-webhook.labels" -}}
+{{ include "common.labels" . }}
+{{ include "n8n-webhook.selectorLabels" . }}
+{{- end }}
+
+{{- define "n8n-worker.labels" -}}
+{{ include "common.labels" . }}
+{{ include "n8n-worker.selectorLabels" . }}
+{{- end }}
+
 {{/*
 Selector labels
 */}}
@@ -49,3 +82,13 @@ Selector labels
 app.kubernetes.io/name: {{ include "n8n.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{- define "n8n-webhook.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "n8n-webhook.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{- define "n8n-worker.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "n8n-worker.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

templates/configmap.yaml

@@ -1,19 +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-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:
@@ -11,8 +14,10 @@ spec:
       {{- include "n8n.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.n8n.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.n8n.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
@@ -32,11 +37,13 @@ spec:
           imagePullPolicy: {{ .Values.n8n.image.pullPolicy }}
           envFrom:
             - configMapRef:
-                - name: {{ include "n8n.fullname" . }}
-          envFrom:
+                name: {{ include "n8n.fullname" . }}
           {{- if .Values.n8n.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.n8n.extraEnvVarsSecret }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "n8n.fullname" . }}
           {{- end }}
           ports:
             - name: http
@@ -50,6 +57,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/secrets.yaml

@@ -12,7 +12,6 @@ data:
   {{- else }}
   N8N_ENCRYPTION_KEY: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
-
   {{- if .Values.config.db_type }}
   DB_TYPE: {{ .Values.config.db_type | b64enc | quote }}
   {{- end }}

templates/webhook-deployment.yaml

@@ -1,24 +1,26 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "n8n.fullname" . }}-webhook
+  name: {{ include "n8n-webhook.fullname" . }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-webhook.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.webhook.autoscaling.enabled }}
   replicas: {{ .Values.webhook.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "n8n.selectorLabels" . | nindent 6 }}
+      {{- include "n8n-webhook.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.webhook.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.webhook.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "n8n.selectorLabels" . | nindent 8 }}
+        {{- include "n8n-webhook.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.webhook.image.pullSecrets }}
       imagePullSecrets:
@@ -32,13 +34,18 @@ 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" . }}
-          envFrom:
+                name: {{ include "n8n.fullname" . }}
           {{- if .Values.webhook.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.webhook.extraEnvVarsSecret }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "n8n.fullname" . }}
           {{- end }}
           ports:
             - name: http

templates/webhook-ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.webhook.ingress.enabled -}}
-{{- $fullName := include "n8n.fullname" . -}}
+{{- $fullName := include "n8n-webhook.fullname" . -}}
 {{- $svcPort := .Values.webhook.service.port -}}
 {{- if and .Values.webhook.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.webhook.ingress.annotations "kubernetes.io/ingress.class") }}
@@ -15,9 +15,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-webhook
+  name: {{ $fullName }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-webhook.labels" . | nindent 4 }}
   {{- with .Values.webhook.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

templates/webhook-service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "n8n.fullname" . }}-webhook
+  name: {{ include "n8n-webhook.fullname" . }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-webhook.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.webhook.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "n8n.selectorLabels" . | nindent 4 }}
+    {{- include "n8n-webhook.selectorLabels" . | nindent 4 }}

templates/worker-deployment.yaml

@@ -1,24 +1,29 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "n8n.fullname" . }}-worker
+  name: {{ include "n8n-worker.fullname" . }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-worker.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 }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "n8n.selectorLabels" . | nindent 6 }}
+      {{- include "n8n-worker.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.worker.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.worker.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "n8n.selectorLabels" . | nindent 8 }}
+        {{- include "n8n-worker.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.worker.image.pullSecrets }}
       imagePullSecrets:
@@ -32,13 +37,18 @@ 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" . }}
-          envFrom:
+                name: {{ include "n8n.fullname" . }}
           {{- if .Values.worker.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.worker.extraEnvVarsSecret }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "n8n.fullname" . }}
           {{- end }}
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}

templates/worker-hpa.yaml

@@ -2,14 +2,14 @@
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "n8n.fullname" . }}-worker
+  name: {{ include "n8n-worker.fullname" . }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-worker.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "n8n.fullname" . }}
+    name: {{ include "n8n-worker.fullname" . }}
   minReplicas: {{ .Values.worker.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.worker.autoscaling.maxReplicas }}
   metrics:

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: ""