Bump n8n version up to 0.215.1

This reverts commit 92f8d4442c.

Chart.yaml

@@ -3,7 +3,7 @@ name: n8n
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.1
-appVersion: 0.202.1
+appVersion: 0.215.1
 icon: https://github.com/n8n-io/n8n/raw/master/assets/n8n-logo.png
 maintainers:
   - email: me@grachevko.ru

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

@@ -8,6 +8,7 @@ metadata:
 data:
   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 }}

templates/n8n-deployment.yaml

@@ -14,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:
@@ -39,6 +41,9 @@ spec:
           {{- if .Values.n8n.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.n8n.extraEnvVarsSecret }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "n8n.fullname" . }}
           {{- end }}
           ports:
             - name: http

templates/webhook-deployment.yaml

@@ -1,27 +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 }}
-  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 }}
   {{- 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:
@@ -44,6 +43,9 @@ spec:
           {{- 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,9 +1,9 @@
 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 }}
@@ -13,15 +13,17 @@ spec:
   {{- 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:
@@ -44,6 +46,9 @@ spec:
           {{- 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,6 +1,7 @@
 config:
   host: ""
   port: "5678"
+  protocol: http
   debug: false
   db_type: postgresdb
   postgres: