Fix service name for webhook ingress

This reverts commit 92f8d4442c.

TODO.md

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

templates/configmap.yaml

@@ -6,16 +6,19 @@ metadata:
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
 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 }}
   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 }}

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

@@ -13,8 +13,10 @@ spec:
       {{- include "n8n.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:
@@ -41,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

@@ -47,11 +47,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}
+                name: {{ $fullName }}-webhook
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ $fullName }}-webhook
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}

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 }}
@@ -13,8 +16,10 @@ spec:
       {{- include "n8n.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:
@@ -41,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 }}

values.yaml

@@ -1,4 +1,7 @@
 config:
+  host: ""
+  port: "5678"
+  protocol: http
   debug: false
   db_type: postgresdb
   postgres: