Skip to content

Commit 88597c9

Browse files
committed
feat: add s3host to actions handler, enable cleanup of harbor repos in ci
1 parent 7912fc4 commit 88597c9

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,8 @@ endif
528528
$$([ $(LAGOON_SSH_PORTAL_LOADBALANCER) ] && echo "--set lagoonTokenPort=$$($(KUBECTL) -n lagoon-core get services lagoon-core-ssh-token -o jsonpath='{.spec.ports[0].port}')") \
529529
--set "QoSMaxBuilds=5" \
530530
$$([ $(BUILD_DEPLOY_CONTROLLER_K8UP_VERSION) = "v2" ] && [ $(INSTALL_K8UP) = true ] && \
531-
echo "--set extraArgs={--skip-tls-verify=true,--lagoon-feature-flag-support-k8upv2}" || \
532-
echo "--set extraArgs={--skip-tls-verify=true}") \
531+
echo "--set extraArgs={--skip-tls-verify=true,--cleanup-harbor-repository-on-delete,--lagoon-feature-flag-support-k8upv2}" || \
532+
echo "--set extraArgs={--skip-tls-verify=true,--cleanup-harbor-repository-on-delete}") \
533533
$$([ $(BUILD_DEPLOY_CONTROLLER_K8UP_VERSION) = "v2" ] && [ $(INSTALL_K8UP) = true ] && \
534534
echo "--set extraEnvs[0].name=LAGOON_FEATURE_FLAG_DEFAULT_K8UP_V2,extraEnvs[0].value=enabled") \
535535
$$([ $(INSTALL_UNAUTHENTICATED_REGISTRY) = false ] && echo --set "harbor.enabled=true") \

charts/lagoon-core/Chart.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,4 @@ dependencies:
4141
annotations:
4242
artifacthub.io/changes: |
4343
- kind: changed
44-
description: update lagoon-core appVersion to v2.23.0
45-
links:
46-
- name: Lagoon 2.23.0 release notes
47-
url: https://docs.lagoon.sh/releases/2.23.0
48-
- kind: changed
49-
description: add KEYCLOAK_ADMIN_API_CLIENT_SECRET variable to keycloak and api deployment
50-
- kind: changed
51-
description: update uselagoon/lagoon-ssh-portal/ssh-portal-api from v0.41.3 to v0.41.4
52-
- kind: changed
53-
description: update uselagoon/lagoon-ssh-portal/ssh-token from v0.41.3 to v0.41.4
54-
- kind: changed
55-
description: update uselagoon/lagoon-opensearch-sync from v0.8.0 to v0.8.1
56-
- kind: changed
57-
description: update NATS chart dependency to 1.2.8
44+
description: add support for s3 files bucket to actions-handler

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ spec:
6161
key: JWTSECRET
6262
- name: GRAPHQL_ENDPOINT
6363
value: http://{{ include "lagoon-core.api.fullname" . }}:{{ .Values.api.service.port }}/graphql
64+
- name: S3_FILES_BUCKET
65+
value: {{ required "A valid .Values.s3FilesBucket required!" .Values.s3FilesBucket | quote }}
66+
- name: S3_FILES_HOST
67+
value: {{ required "A valid .Values.s3FilesHost required!" .Values.s3FilesHost | quote }}
68+
{{- with .Values.s3FilesRegion }}
69+
- name: S3_FILES_REGION
70+
value: {{ . | quote }}
71+
{{- end }}
6472
{{- range $key, $val := .Values.actionsHandler.additionalEnvs }}
6573
- name: {{ $key }}
6674
value: {{ $val | quote }}

0 commit comments

Comments
 (0)