chore: bump version up to 1.9.0

Reviewed-on: #1
Co-authored-by: Konstantin Grachev <me@grachevko.ru>
Co-committed-by: Konstantin Grachev <me@grachevko.ru>

.drone.yml

@@ -9,43 +9,14 @@ trigger:
   - tag
 
 steps:
-  - name: lint
+- name: release
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
+  image: cr.grachevko.ru/drone/helm:24
-    pull: always
+  settings:
-    commands:
+    tag: ${DRONE_TAG}
-      - helm lint .
+    username:
-
-  - 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 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
-      - 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:
       from_secret: HELM_REPO_USERNAME
-      HELM_REPO_PASSWORD:
+    password:
       from_secret: HELM_REPO_PASSWORD
-    depends_on:
-      - version
   when:
     event:
     - tag

.gitea/workflows/release.yaml

@@ -0,0 +1,29 @@
+name: Release Chart
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    env:
+      REGISTRY: harbor.grachevko.ru
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: yokawasa/action-setup-kube-tools@v0.9.3
+      with:
+        setup-tools: helm
+    - name: deps and lint
+      run: |
+        helm dependency update
+        helm lint --strict .
+    - name: build
+      run: helm package --version ${{ gitea.ref_name }} .
+    - name: publish
+      run: |
+        echo "${{ secrets.REGISTRY_PASSWORD }}" | helm registry login ${{ env.REGISTRY }} --username "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+        helm push ./*.tgz oci://harbor.grachevko.ru/${{ gitea.repository }}

Chart.yaml

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

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,9 @@ metadata:
 data:
   N8N_HOST: {{ .Values.config.host | quote }}
   N8N_PORT: {{ .Values.config.port | quote }}
+  N8N_PROTOCOL: {{ .Values.config.protocol | quote }}
+  N8N_METRICS: {{ .Values.config.metrics.enabled | quote }}
+  N8N_METRICS_PREFIX: {{ .Values.config.metrics.prefix | quote }}
   WEBHOOK_URL: {{ .Values.config.webhook_url | quote }}
   EXECUTIONS_MODE: "queue"
   EXECUTIONS_PROCESS: {{ .Values.config.executions.process | quote }}

templates/n8n-deployment.yaml

@@ -4,8 +4,6 @@ metadata:
   name: {{ include "n8n.fullname" . }}
   labels:
     {{- include "n8n.labels" . | nindent 4 }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
 spec:
   replicas: 1
   selector:
@@ -13,8 +11,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 +38,9 @@ spec:
           {{- if .Values.n8n.extraEnvVarsSecret }}
         - secretRef:
             name: {{ .Values.n8n.extraEnvVarsSecret }}
+          {{- else }}
+        - secretRef:
+            name: {{ include "n8n.fullname" . }}
           {{- end }}
         ports:
         - name: http
@@ -51,6 +54,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/tests/test-connection.yaml

@@ -10,6 +10,6 @@ spec:
   containers:
   - name: wget
     image: busybox
-      command: [ 'wget' ]
+    command: ['wget']
-      args: [ '{{ include "n8n.fullname" . }}:{{ .Values.n8n.service.port }}' ]
+    args: ['{{ include "n8n.fullname" . }}:{{ .Values.n8n.service.port }}']
   restartPolicy: Never

templates/webhook-deployment.yaml

@@ -1,26 +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 }}
 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:
@@ -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,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,26 +1,26 @@
 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 }}
 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:
@@ -43,6 +43,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:
@@ -25,6 +26,9 @@ config:
       allow:
         builtin: '*'
         external: '*'
+  metrics:
+    enabled: false
+    prefix: n8n_
 
 redis:
   enabled: false
@@ -44,7 +48,7 @@ n8n:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -52,17 +56,17 @@ n8n:
     # Specifies whether a service account should be created
     create: false
     # Annotations to add to the service account
-    annotations: { }
+    annotations: {}
     # The name of the service account to use.
     # If not set and create is true, a name is generated using the fullname template
     name: ""
 
-  podAnnotations: { }
+  podAnnotations: {}
 
-  podSecurityContext: { }
+  podSecurityContext: {}
   # fsGroup: 2000
 
-  securityContext: { }
+  securityContext: {}
     # capabilities:
   #   drop:
   #   - ALL
@@ -77,7 +81,7 @@ n8n:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -85,12 +89,12 @@ n8n:
       paths:
       - path: /
         pathType: ImplementationSpecific
-    tls: [ ]
+    tls: []
     #  - secretName: chart-example-tls
     #    hosts:
     #      - chart-example.local
 
-  resources: { }
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -102,11 +106,11 @@ n8n:
   #   cpu: 100m
   #   memory: 128Mi
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}
 
 webhook:
   replicaCount: 1
@@ -117,7 +121,7 @@ webhook:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -125,17 +129,17 @@ webhook:
     # Specifies whether a service account should be created
     create: false
     # Annotations to add to the service account
-    annotations: { }
+    annotations: {}
     # The name of the service account to use.
     # If not set and create is true, a name is generated using the fullname template
     name: ""
 
-  podAnnotations: { }
+  podAnnotations: {}
 
-  podSecurityContext: { }
+  podSecurityContext: {}
   # fsGroup: 2000
 
-  securityContext: { }
+  securityContext: {}
     # capabilities:
     #   drop:
   #   - ALL
@@ -150,7 +154,7 @@ webhook:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -158,12 +162,12 @@ webhook:
       paths:
       - path: /
         pathType: ImplementationSpecific
-    tls: [ ]
+    tls: []
     #  - secretName: chart-example-tls
     #    hosts:
     #      - chart-example.local
 
-  resources: { }
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -182,11 +186,11 @@ webhook:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}
 
 worker:
   replicaCount: 1
@@ -197,7 +201,7 @@ worker:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -205,17 +209,17 @@ worker:
     # Specifies whether a service account should be created
     create: false
     # Annotations to add to the service account
-    annotations: { }
+    annotations: {}
     # The name of the service account to use.
     # If not set and create is true, a name is generated using the fullname template
     name: ""
 
-  podAnnotations: { }
+  podAnnotations: {}
 
-  podSecurityContext: { }
+  podSecurityContext: {}
   # fsGroup: 2000
 
-  securityContext: { }
+  securityContext: {}
     # capabilities:
     #   drop:
   #   - ALL
@@ -230,7 +234,7 @@ worker:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -238,12 +242,12 @@ worker:
       paths:
       - path: /
         pathType: ImplementationSpecific
-    tls: [ ]
+    tls: []
     #  - secretName: chart-example-tls
     #    hosts:
     #      - chart-example.local
 
-  resources: { }
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -262,8 +266,8 @@ worker:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}