ci: bump helm version

.drone.yml

@@ -5,47 +5,19 @@ name: default
 
 trigger:
   event:
-    - push
+  - push
-    - tag
+  - tag
 
 steps:
-  - name: lint
+- name: release
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
+  image: cr.grachevko.ru/drone/helm:21
-    pull: always
+  settings:
-    commands:
+    name: n8n
-      - helm lint .
+    tag: ${DRONE_TAG}
-
+    username:
-  - name: version
+      from_secret: HELM_REPO_USERNAME
-    image: cr.grachevko.ru/docker.io/mikefarah/yq:latest
+    password:
-    pull: always
+      from_secret: HELM_REPO_PASSWORD
-    user: root
+  when:
-    commands:
+    event:
-      - yq -i '.version = "'$DRONE_TAG'"' Chart.yaml
+    - tag
-      - 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:
-        from_secret: HELM_REPO_PASSWORD
-    depends_on:
-      - version
-    when:
-      event:
-        - tag

Chart.yaml

@@ -3,15 +3,15 @@ name: n8n
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.1
-appVersion: 0.213.0
+appVersion: 0.227.1
 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
+  name: Konstantin Grachev
 sources:
-  - https://git.grachevko.ru/n8n/chart
+- https://git.grachevko.ru/n8n/chart
 dependencies:
-  - name: redis
+- name: redis
-    version: ^17
+  version: ^17
-    repository: https://charts.bitnami.com/bitnami
+  repository: https://charts.bitnami.com/bitnami
-    condition: redis.enabled
+  condition: redis.enabled

templates/configmap.yaml

@@ -9,6 +9,8 @@ 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,9 +4,6 @@ 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:
@@ -30,40 +27,40 @@ spec:
       securityContext:
         {{- toYaml .Values.n8n.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
+      - name: {{ .Chart.Name }}
-          securityContext:
+        securityContext:
             {{- toYaml .Values.n8n.securityContext | nindent 12 }}
-          image: "{{ .Values.n8n.image.registry }}/{{ .Values.n8n.image.repository }}:{{ .Values.n8n.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.n8n.image.registry }}/{{ .Values.n8n.image.repository }}:{{ .Values.n8n.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.n8n.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.n8n.image.pullPolicy }}
-          envFrom:
+        envFrom:
-            - configMapRef:
+        - configMapRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- if .Values.n8n.extraEnvVarsSecret }}
-            - secretRef:
+        - secretRef:
-                name: {{ .Values.n8n.extraEnvVarsSecret }}
+            name: {{ .Values.n8n.extraEnvVarsSecret }}
           {{- else }}
-            - secretRef:
+        - secretRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- end }}
-          ports:
+        ports:
-            - name: http
+        - name: http
-              containerPort: 5678
+          containerPort: 5678
-              protocol: TCP
+          protocol: TCP
-          livenessProbe:
+        livenessProbe:
-            httpGet:
+          httpGet:
-              path: /healthz
+            path: /healthz
-              port: http
+            port: http
-          readinessProbe:
+        readinessProbe:
-            httpGet:
+          httpGet:
-              path: /healthz
+            path: /healthz
-              port: http
+            port: http
-          startupProbe:
+        startupProbe:
-            httpGet:
+          httpGet:
-              path: /healthz
+            path: /healthz
-              port: http
+            port: http
-            failureThreshold: 30
+          failureThreshold: 30
-            periodSeconds: 10
+          periodSeconds: 10
-          resources:
+        resources:
             {{- toYaml .Values.n8n.resources | nindent 12 }}
       {{- with .Values.n8n.nodeSelector }}
       nodeSelector:

templates/n8n-ingress.yaml

@@ -29,30 +29,30 @@ spec:
   {{- if .Values.n8n.ingress.tls }}
   tls:
     {{- range .Values.n8n.ingress.tls }}
-    - hosts:
+  - hosts:
         {{- range .hosts }}
-        - {{ . | quote }}
+    - {{ . | quote }}
         {{- end }}
-      secretName: {{ .secretName }}
+    secretName: {{ .secretName }}
     {{- end }}
   {{- end }}
   rules:
     {{- range .Values.n8n.ingress.hosts }}
-    - host: {{ .host | quote }}
+  - host: {{ .host | quote }}
-      http:
+    http:
-        paths:
+      paths:
           {{- range .paths }}
-          - path: {{ .path }}
+      - path: {{ .path }}
-            pathType: {{ default "ImplementationSpecific" .pathType }}
+        pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend:
+        backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
+          service:
-                name: {{ $fullName }}
+            name: {{ $fullName }}
-                port:
+            port:
-                  number: {{ $svcPort }}
+              number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
+          serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+          servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

templates/n8n-service.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
   type: {{ .Values.n8n.service.type }}
   ports:
-    - port: {{ .Values.n8n.service.port }}
+  - port: {{ .Values.n8n.service.port }}
-      targetPort: http
+    targetPort: http
-      protocol: TCP
+    protocol: TCP
-      name: http
+    name: http
   selector:
     {{- include "n8n.selectorLabels" . | nindent 4 }}

templates/tests/test-connection.yaml

@@ -8,8 +8,8 @@ metadata:
     "helm.sh/hook": test
 spec:
   containers:
-    - name: wget
+  - name: wget
-      image: busybox
+    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

@@ -29,37 +29,37 @@ spec:
       securityContext:
         {{- toYaml .Values.webhook.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
+      - name: {{ .Chart.Name }}
-          securityContext:
+        securityContext:
             {{- toYaml .Values.webhook.securityContext | nindent 12 }}
-          image: "{{ .Values.webhook.image.registry }}/{{ .Values.webhook.image.repository }}:{{ .Values.webhook.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.webhook.image.registry }}/{{ .Values.webhook.image.repository }}:{{ .Values.webhook.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
-          command:
+        command:
-            - n8n
+        - n8n
-            - webhook
+        - webhook
-          envFrom:
+        envFrom:
-            - configMapRef:
+        - configMapRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- if .Values.webhook.extraEnvVarsSecret }}
-            - secretRef:
+        - secretRef:
-                name: {{ .Values.webhook.extraEnvVarsSecret }}
+            name: {{ .Values.webhook.extraEnvVarsSecret }}
           {{- else }}
-            - secretRef:
+        - secretRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- end }}
-          ports:
+        ports:
-            - name: http
+        - name: http
-              containerPort: 5678
+          containerPort: 5678
-              protocol: TCP
+          protocol: TCP
-          livenessProbe:
+        livenessProbe:
-            httpGet:
+          httpGet:
-              path: /healthz
+            path: /healthz
-              port: http
+            port: http
-          readinessProbe:
+        readinessProbe:
-            httpGet:
+          httpGet:
-              path: /healthz
+            path: /healthz
-              port: http
+            port: http
-          resources:
+        resources:
             {{- toYaml .Values.webhook.resources | nindent 12 }}
       {{- with .Values.webhook.nodeSelector }}
       nodeSelector:

templates/webhook-ingress.yaml

@@ -29,30 +29,30 @@ spec:
   {{- if .Values.webhook.ingress.tls }}
   tls:
     {{- range .Values.webhook.ingress.tls }}
-    - hosts:
+  - hosts:
         {{- range .hosts }}
-        - {{ . | quote }}
+    - {{ . | quote }}
         {{- end }}
-      secretName: {{ .secretName }}
+    secretName: {{ .secretName }}
     {{- end }}
   {{- end }}
   rules:
     {{- range .Values.webhook.ingress.hosts }}
-    - host: {{ .host | quote }}
+  - host: {{ .host | quote }}
-      http:
+    http:
-        paths:
+      paths:
           {{- range .paths }}
-          - path: {{ .path }}
+      - path: {{ .path }}
-            pathType: {{ default "ImplementationSpecific" .pathType }}
+        pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend:
+        backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
+          service:
-                name: {{ $fullName }}
+            name: {{ $fullName }}
-                port:
+            port:
-                  number: {{ $svcPort }}
+              number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
+          serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+          servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

templates/webhook-service.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
   type: {{ .Values.webhook.service.type }}
   ports:
-    - port: {{ .Values.webhook.service.port }}
+  - port: {{ .Values.webhook.service.port }}
-      targetPort: http
+    targetPort: http
-      protocol: TCP
+    protocol: TCP
-      name: http
+    name: http
   selector:
     {{- include "n8n-webhook.selectorLabels" . | nindent 4 }}

templates/worker-deployment.yaml

@@ -4,9 +4,6 @@ metadata:
   name: {{ include "n8n-worker.fullname" . }}
   labels:
     {{- 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 }}
@@ -32,25 +29,25 @@ spec:
       securityContext:
         {{- toYaml .Values.worker.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
+      - name: {{ .Chart.Name }}
-          securityContext:
+        securityContext:
             {{- toYaml .Values.worker.securityContext | nindent 12 }}
-          image: "{{ .Values.worker.image.registry }}/{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.worker.image.registry }}/{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
-          command:
+        command:
-            - n8n
+        - n8n
-            - worker
+        - worker
-          envFrom:
+        envFrom:
-            - configMapRef:
+        - configMapRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- if .Values.worker.extraEnvVarsSecret }}
-            - secretRef:
+        - secretRef:
-                name: {{ .Values.worker.extraEnvVarsSecret }}
+            name: {{ .Values.worker.extraEnvVarsSecret }}
           {{- else }}
-            - secretRef:
+        - secretRef:
-                name: {{ include "n8n.fullname" . }}
+            name: {{ include "n8n.fullname" . }}
           {{- end }}
-          resources:
+        resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
       {{- with .Values.worker.nodeSelector }}
       nodeSelector:

templates/worker-hpa.yaml

@@ -14,15 +14,15 @@ spec:
   maxReplicas: {{ .Values.worker.autoscaling.maxReplicas }}
   metrics:
     {{- if .Values.worker.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
+  - type: Resource
-      resource:
+    resource:
-        name: cpu
+      name: cpu
-        targetAverageUtilization: {{ .Values.worker.autoscaling.targetCPUUtilizationPercentage }}
+      targetAverageUtilization: {{ .Values.worker.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.worker.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
+  - type: Resource
-      resource:
+    resource:
-        name: memory
+      name: memory
-        targetAverageUtilization: {{ .Values.worker.autoscaling.targetMemoryUtilizationPercentage }}
+      targetAverageUtilization: {{ .Values.worker.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}

values.yaml

@@ -26,6 +26,9 @@ config:
       allow:
         builtin: '*'
         external: '*'
+  metrics:
+    enabled: false
+    prefix: n8n_
 
 redis:
   enabled: false
@@ -45,7 +48,7 @@ n8n:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -53,20 +56,20 @@ 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:
+  #   drop:
-    #   - ALL
+  #   - ALL
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
   # runAsUser: 1000
@@ -78,36 +81,36 @@ n8n:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
-      - host: chart-example.local
+    - host: chart-example.local
-        paths:
+      paths:
-          - path: /
+      - path: /
-            pathType: ImplementationSpecific
+        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
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     # limits:
-    #   cpu: 100m
+  #   cpu: 100m
-    #   memory: 128Mi
+  #   memory: 128Mi
   # requests:
   #   cpu: 100m
   #   memory: 128Mi
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}
 
 webhook:
   replicaCount: 1
@@ -118,7 +121,7 @@ webhook:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -126,21 +129,21 @@ 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
+  #   - ALL
-    # readOnlyRootFilesystem: true
+  # readOnlyRootFilesystem: true
   # runAsNonRoot: true
   # runAsUser: 1000
 
@@ -151,28 +154,28 @@ webhook:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
-      - host: chart-example.local
+    - host: chart-example.local
-        paths:
+      paths:
-          - path: /
+      - path: /
-            pathType: ImplementationSpecific
+        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
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     # limits:
     #   cpu: 100m
-    #   memory: 128Mi
+  #   memory: 128Mi
-    # requests:
+  # requests:
   #   cpu: 100m
   #   memory: 128Mi
 
@@ -183,11 +186,11 @@ webhook:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}
 
 worker:
   replicaCount: 1
@@ -198,7 +201,7 @@ worker:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
 
   extraEnvVarsSecret: ""
 
@@ -206,21 +209,21 @@ 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
+  #   - ALL
-    # readOnlyRootFilesystem: true
+  # readOnlyRootFilesystem: true
   # runAsNonRoot: true
   # runAsUser: 1000
 
@@ -231,28 +234,28 @@ worker:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
-      - host: chart-example.local
+    - host: chart-example.local
-        paths:
+      paths:
-          - path: /
+      - path: /
-            pathType: ImplementationSpecific
+        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
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     # limits:
     #   cpu: 100m
-    #   memory: 128Mi
+  #   memory: 128Mi
-    # requests:
+  # requests:
   #   cpu: 100m
   #   memory: 128Mi
 
@@ -263,8 +266,8 @@ worker:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}