Remove $fullName var from ingress templates

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

@@ -6,6 +6,7 @@ metadata:
     {{- 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:
@@ -13,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:
@@ -38,6 +41,9 @@ spec:
           {{- if .Values.n8n.extraEnvVarsSecret }}
             - secretRef:
                 name: {{ .Values.n8n.extraEnvVarsSecret }}
+          {{- else }}
+            - secretRef:
+                name: {{ include "n8n.fullname" . }}
           {{- end }}
           ports:
             - name: http
@@ -51,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/n8n-ingress.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.n8n.ingress.enabled -}}
-{{- $fullName := include "n8n.fullname" . -}}
 {{- $svcPort := .Values.n8n.service.port -}}
 {{- if and .Values.n8n.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.n8n.ingress.annotations "kubernetes.io/ingress.class") }}
@@ -15,7 +14,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "n8n.fullname" . }}
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
   {{- with .Values.n8n.ingress.annotations }}
@@ -47,11 +46,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}
+                name: {{ include "n8n.fullname" . }}
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ include "n8n.fullname" . }}
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}

templates/webhook-deployment.yaml

@@ -4,8 +4,6 @@ metadata:
   name: {{ include "n8n.fullname" . }}-webhook
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
 spec:
   {{- if not .Values.webhook.autoscaling.enabled }}
   replicas: {{ .Values.webhook.replicaCount }}
@@ -15,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:
@@ -43,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,4 @@
 {{- if .Values.webhook.ingress.enabled -}}
-{{- $fullName := include "n8n.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,7 +14,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-webhook
+  name: {{ include "n8n.fullname" . }}-webhook
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
   {{- with .Values.webhook.ingress.annotations }}
@@ -47,11 +46,11 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}
+                name: {{ include "n8n.fullname" . }}-webhook
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ include "n8n.fullname" . }}-webhook
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}

templates/worker-deployment.yaml

@@ -6,6 +6,7 @@ metadata:
     {{- 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 }}
@@ -15,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:
@@ -43,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,6 +1,7 @@
 config:
   host: ""
   port: "5678"
+  protocol: http
   debug: false
   db_type: postgresdb
   postgres: