ci: use oci

.drone.yml

@@ -5,47 +5,19 @@ name: default
 
 trigger:
   event:
-    - push
   - tag
 
 steps:
-  - name: lint
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
-    pull: always
-    commands:
-      - helm lint .
-
-  - 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:
+- name: release
+  image: cr.grachevko.ru/drone/helm:20
+  settings:
+    name: n8n
+    tag: ${DRONE_TAG}
+    username:
       from_secret: HELM_REPO_USERNAME
-      HELM_REPO_PASSWORD:
+    password:
       from_secret: HELM_REPO_PASSWORD
-    depends_on:
-      - version
   when:
-      event:
-        - tag
+    branch:
+    - master
+    - rc

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: 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
 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/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:

templates/tests/test-connection.yaml

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

templates/webhook-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ include "n8n-webhook.fullname" . }}
   labels:
-    {{- include "n8n.labels" . | nindent 4 }}
+    {{- include "n8n-webhook.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.webhook.autoscaling.enabled }}
   replicas: {{ .Values.webhook.replicaCount }}

templates/webhook-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "n8n-webhook.fullname" . }}-webhook
+  name: {{ include "n8n-webhook.fullname" . }}
   labels:
     {{- include "n8n-webhook.labels" . | nindent 4 }}
 spec:

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 }}

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

@@ -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,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
@@ -78,7 +81,7 @@ n8n:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -86,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
@@ -103,11 +106,11 @@ n8n:
   #   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,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
@@ -151,7 +154,7 @@ webhook:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -159,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
@@ -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,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
@@ -231,7 +234,7 @@ worker:
   ingress:
     enabled: false
     className: ""
-    annotations: { }
+    annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     hosts:
@@ -239,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
@@ -263,8 +266,8 @@ worker:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-  nodeSelector: { }
+  nodeSelector: {}
 
-  tolerations: [ ]
+  tolerations: []
 
-  affinity: { }
+  affinity: {}