feat: use new webhook-handler

Makefile

@@ -661,7 +661,6 @@ endif
 		--set logs2notifications.logs2webhooks.disabled=$(LOGS2WEBHOOKS_DISABLED) \
 		$$([ $(IMAGE_REGISTRY) ] && [ $(INSTALL_STABLE_CORE) != true ] && echo '--set ssh.image.repository=$(IMAGE_REGISTRY)/ssh') \
 		$$([ $(IMAGE_REGISTRY) ] && [ $(INSTALL_STABLE_CORE) != true ] && echo '--set webhookHandler.image.repository=$(IMAGE_REGISTRY)/webhook-handler') \
-		$$([ $(IMAGE_REGISTRY) ] && [ $(INSTALL_STABLE_CORE) != true ] && echo '--set webhooks2tasks.image.repository=$(IMAGE_REGISTRY)/webhooks2tasks') \
 		--set s3BAASAccessKeyID=lagoonFilesAccessKey \
 		--set s3BAASSecretAccessKey=lagoonFilesSecretKey \
 		--set s3FilesAccessKeyID=lagoonFilesAccessKey \

charts/lagoon-core/Chart.yaml

@@ -42,3 +42,7 @@ annotations:
   artifacthub.io/changes: |
     - kind: fixed
       description: don't deploy any 'ui-beta' resources when not enabled
+    - kind: changed
+      description: backup-handler no longer requires rabbitmq connections
+    - kind: removed
+      description: removed webhooks2tasks as no longer used

charts/lagoon-core/README.md

@@ -25,8 +25,6 @@ logs2webhook:
   enabled: false
 webhookHandler:
   enabled: false
-webhooks2tasks:
-  enabled: false
 sshPortal:
   enabled: false
 ```

charts/lagoon-core/ci/linter-values.yaml

@@ -113,14 +113,6 @@ authServer:
     requests:
       cpu: "10m"
 
-webhooks2tasks:
-  replicaCount: 1
-  image:
-    repository: uselagoon/webhooks2tasks
-  resources:
-    requests:
-      cpu: "10m"
-
 webhookHandler:
   replicaCount: 1
   image:

charts/lagoon-core/ci/testlagoon-main-override.yaml

@@ -36,10 +36,6 @@ authServer:
   image:
     repository: testlagoon/auth-server
 
-webhooks2tasks:
-  image:
-    repository: testlagoon/webhooks2tasks
-
 webhookHandler:
   image:
     repository: testlagoon/webhook-handler

charts/lagoon-core/templates/_helpers.tpl

@@ -284,37 +284,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 
-
-{{/*
-Create a default fully qualified app name for webhooks2tasks.
-*/}}
-{{- define "lagoon-core.webhooks2tasks.fullname" -}}
-{{- include "lagoon-core.fullname" . }}-webhooks2tasks
-{{- end }}
-
-{{/*
-Common labels webhooks2tasks
-*/}}
-{{- define "lagoon-core.webhooks2tasks.labels" -}}
-helm.sh/chart: {{ include "lagoon-core.chart" . }}
-{{ include "lagoon-core.webhooks2tasks.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels webhooks2tasks
-*/}}
-{{- define "lagoon-core.webhooks2tasks.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "lagoon-core.name" . }}
-app.kubernetes.io/component: {{ include "lagoon-core.webhooks2tasks.fullname" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-
-
 {{/*
 Create a default fully qualified app name for webhookHandler.
 */}}

charts/lagoon-core/templates/api.deployment.yaml

@@ -79,6 +79,48 @@ spec:
           {{- toYaml .Values.api.securityContext | nindent 10 }}
         image: "{{ .Values.apiSidecarHandler.image.repository }}:{{ coalesce .Values.apiSidecarHandler.image.tag .Values.imageTag .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.apiSidecarHandler.image.pullPolicy }}
+        env:
+        - name: JWTSECRET
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "lagoon-core.fullname" . }}-secrets
+              key: JWTSECRET
+        - name: LAGOON_VERSION
+          value: {{ .Chart.AppVersion | replace "-" "." }}
+        - name: RABBITMQ_HOST
+          value: {{ include "lagoon-core.broker.fullname" . }}
+        - name: RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "lagoon-core.broker.fullname" . }}
+              key: RABBITMQ_PASSWORD
+        - name: RABBITMQ_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "lagoon-core.broker.fullname" . }}
+              key: RABBITMQ_USERNAME
+        - name: DEFAULT_BUILD_DEPLOY_IMAGE
+        {{- with dig "default" "image" nil .Values.buildDeployImage }}
+          value: {{ . }}
+        {{- else }}
+          value: {{ print "uselagoon/build-deploy-image:core-" .Chart.AppVersion }}
+        {{- end }}
+      {{- if dig "edge" "enabled" nil .Values.buildDeployImage }}
+        - name: EDGE_BUILD_DEPLOY_IMAGE
+          value: {{ coalesce .Values.buildDeployImage.edge.image (print "uselagoon/build-deploy-image:edge-v" (semver .Chart.AppVersion).Major "." (semver .Chart.AppVersion).Minor ".x") }}
+      {{- end }}
+        - name: PROJECTSEED
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "lagoon-core.fullname" . }}-secrets
+              key: PROJECTSEED
+      {{- range $key, $val := .Values.api.sidecar.additionalEnvs }}
+        - name: {{ $key }}
+          value: {{ $val | quote }}
+      {{- end }}
+        envFrom:
+        - secretRef:
+            name: {{ include "lagoon-core.api.fullname" . }}
         livenessProbe:
           httpGet:
             path: /status

charts/lagoon-core/templates/backup-handler.deployment.yaml

@@ -15,7 +15,6 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/broker.secret: {{ include (print $.Template.BasePath "/broker.secret.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     {{- with .Values.backupHandler.podAnnotations }}
         {{- toYaml . | nindent 8 }}
@@ -38,22 +37,8 @@ spec:
         command:
         - "sh"
         - "-c"
-        - |
-          while ! nc -zvw5 $RABBITMQ_ADDRESS $RABBITMQ_PORT; do sleep 2; done
-          exec /app/backup-handler
+        - exec /app/backup-handler
         env:
-        - name: RABBITMQ_ADDRESS
-          value: {{ include "lagoon-core.broker.fullname" . }}
-        - name: RABBITMQ_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "lagoon-core.broker.fullname" . }}
-              key: RABBITMQ_USERNAME
-        - name: RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "lagoon-core.broker.fullname" . }}
-              key: RABBITMQ_PASSWORD
         - name: JWT_SECRET
           valueFrom:
             secretKeyRef:

charts/lagoon-core/templates/webhook-handler.deployment.yaml

@@ -16,6 +16,7 @@ spec:
     metadata:
       annotations:
         checksum/broker.secret: {{ include (print $.Template.BasePath "/broker.secret.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     {{- with .Values.webhookHandler.podAnnotations }}
         {{- toYaml . | nindent 8 }}
     {{- end }}
@@ -35,7 +36,7 @@ spec:
         image: "{{ .Values.webhookHandler.image.repository }}:{{ coalesce .Values.webhookHandler.image.tag .Values.imageTag .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.webhookHandler.image.pullPolicy }}
         env:
-        - name: RABBITMQ_HOST
+        - name: RABBITMQ_ADDRESS
           value: {{ include "lagoon-core.broker.fullname" . }}
         - name: RABBITMQ_PASSWORD
           valueFrom:
@@ -47,6 +48,13 @@ spec:
             secretKeyRef:
               name: {{ include "lagoon-core.broker.fullname" . }}
               key: RABBITMQ_USERNAME
+        - name: JWT_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "lagoon-core.fullname" . }}-secrets
+              key: JWTSECRET
+        - name: GRAPHQL_ENDPOINT
+          value: http://{{ include "lagoon-core.api.fullname" . }}:{{ .Values.api.service.port }}/graphql
       {{- range $key, $val := .Values.webhookHandler.additionalEnvs }}
         - name: {{ $key }}
           value: {{ $val | quote }}