chore: remove webhooks2tasks and extend webhook-handler secrets, add needed secrets to api-sidecar

Author: shreddedbacon

Makefile

@@ -593,7 +593,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/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

@@ -84,6 +84,33 @@ 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
+      {{- 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/webhook-handler.deployment.yaml

@@ -35,7 +35,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 +47,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 }}

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

@@ -155,6 +155,8 @@ api:
 
   additionalEnvs:
   #   FOO: Bar
+  sidecar:
+    additionalEnvs:
 
   autoscaling:
     enabled: false
@@ -494,34 +496,6 @@ authServer:
     targetCPUUtilizationPercentage: 80
     # targetMemoryUtilizationPercentage: 80
 
-webhooks2tasks:
-  enabled: true
-  replicaCount: 2
-  image:
-    repository: uselagoon/webhooks2tasks
-    pullPolicy: Always
-    # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
-
-  podAnnotations: {}
-
-  securityContext: {}
-
-  resources:
-    requests:
-      memory: "64Mi"
-      cpu: "50m"
-
-  additionalEnvs:
-  #   FOO: Bar
-
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 100
-    targetCPUUtilizationPercentage: 80
-    # targetMemoryUtilizationPercentage: 80
-
 webhookHandler:
   enabled: true
   replicaCount: 2