From 001926ba9c73280103d908066587738cb1d8d2d9 Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Wed, 6 Mar 2024 13:37:57 +1100
Subject: [PATCH] feat: add s3host to actions handler, enable cleanup of harbor
 repos in ci

---
 Makefile                                                  | 4 ++--
 charts/lagoon-core/Chart.yaml                             | 2 ++
 .../lagoon-core/templates/actions-handler.deployment.yaml | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bd6a862cf..c2cbf2bc7 100644
--- a/Makefile
+++ b/Makefile
@@ -528,8 +528,8 @@ endif
 		$$([ $(LAGOON_SSH_PORTAL_LOADBALANCER) ] && echo "--set lagoonTokenPort=$$($(KUBECTL) -n lagoon-core get services lagoon-core-ssh-token -o jsonpath='{.spec.ports[0].port}')") \
 		--set "QoSMaxBuilds=5" \
 		$$([ $(BUILD_DEPLOY_CONTROLLER_K8UP_VERSION) = "v2" ] && [ $(INSTALL_K8UP) = true ] && \
-			echo "--set extraArgs={--skip-tls-verify=true,--lagoon-feature-flag-support-k8upv2}" || \
-			echo "--set extraArgs={--skip-tls-verify=true}") \
+			echo "--set extraArgs={--skip-tls-verify=true,--cleanup-harbor-repository-on-delete,--lagoon-feature-flag-support-k8upv2}" || \
+			echo "--set extraArgs={--skip-tls-verify=true,--cleanup-harbor-repository-on-delete}") \
 		$$([ $(BUILD_DEPLOY_CONTROLLER_K8UP_VERSION) = "v2" ] && [ $(INSTALL_K8UP) = true ] && \
 			echo "--set extraEnvs[0].name=LAGOON_FEATURE_FLAG_DEFAULT_K8UP_V2,extraEnvs[0].value=enabled") \
 		$$([ $(INSTALL_UNAUTHENTICATED_REGISTRY) = false ] && echo --set "harbor.enabled=true") \
diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml
index 531e7b78d..58f1e049a 100644
--- a/charts/lagoon-core/Chart.yaml
+++ b/charts/lagoon-core/Chart.yaml
@@ -48,3 +48,5 @@ annotations:
       description: update uselagoon/lagoon-ssh-portal/ssh-token from v0.41.3 to v0.41.4
     - kind: changed
       description: update uselagoon/lagoon-opensearch-sync from v0.8.0 to v0.8.1
+    - kind: changed
+      description: add support for s3 files bucket to actions-handler
diff --git a/charts/lagoon-core/templates/actions-handler.deployment.yaml b/charts/lagoon-core/templates/actions-handler.deployment.yaml
index 027d8cfea..3f1f7d87c 100644
--- a/charts/lagoon-core/templates/actions-handler.deployment.yaml
+++ b/charts/lagoon-core/templates/actions-handler.deployment.yaml
@@ -61,6 +61,14 @@ spec:
               key: JWTSECRET
         - name: GRAPHQL_ENDPOINT
           value: http://{{ include "lagoon-core.api.fullname" . }}:{{ .Values.api.service.port }}/graphql
+        - name: S3_FILES_BUCKET
+          value: {{ required "A valid .Values.s3FilesBucket required!" .Values.s3FilesBucket | quote }}
+        - name: S3_FILES_HOST
+          value: {{ required "A valid .Values.s3FilesHost required!" .Values.s3FilesHost | quote }}
+        {{- with .Values.s3FilesRegion }}
+        - name: S3_FILES_REGION
+          value: {{ . | quote }}
+        {{- end }}
       {{- range $key, $val := .Values.actionsHandler.additionalEnvs }}
         - name: {{ $key }}
           value: {{ $val | quote }}