feat: add s3host to actions handler, enable cleanup of harbor repos i…

…n ci
uselagoon · Jan 1, 2025 · 88597c9 · 88597c9
1 parent 7912fc4
commit 88597c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git 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
@@ -41,17 +41,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-core appVersion to v2.23.0
-      links:
-        - name: Lagoon 2.23.0 release notes
-          url: https://docs.lagoon.sh/releases/2.23.0
-    - kind: changed
-      description: add KEYCLOAK_ADMIN_API_CLIENT_SECRET variable to keycloak and api deployment
-    - kind: changed
-      description: update uselagoon/lagoon-ssh-portal/ssh-portal-api from v0.41.3 to v0.41.4
-    - kind: changed
-      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: update NATS chart dependency to 1.2.8
+      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
@@ -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 }}