sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-07 16:01:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(helmfile): Fix ee deployment

Browse Source
This commit is contained in:
Thomas Kaltenbrunner
2025-02-18 21:34:46 +01:00
committed by Thorsten Roßner
parent 17a0adb67c
commit ba333cd74e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -299,12 +299,12 @@ env-start:
# Set credentials for openDesk Enterprise Registry # Set credentials for openDesk Enterprise Registry
- | - |
if [ "${OPENDESK_ENTERPRISE}" = "true" ]; then if [ "${OPENDESK_ENTERPRISE}" = "true" ]; then
kubectl create secret kubectl create secret \
--namespace "${NAMESPACE}" --namespace "${NAMESPACE}" \
docker-registry enterprise-registry docker-registry enterprise-registry \
--docker-server "registry.opencode.de" --docker-server "registry.opencode.de" \
--docker-username "${OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME}" --docker-username "${OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME}" \
--docker-password "${OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD}" --docker-password "${OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD}" \
--dry-run=client -o yaml | kubectl apply -f - --dry-run=client -o yaml | kubectl apply -f -
fi fi
stage: "env" stage: "env"

8
helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl
View File

@@ -9,8 +9,8 @@ repositories:
verify: {{ .Values.charts.dovecot.verify }} verify: {{ .Values.charts.dovecot.verify }}
oci: true oci: true
{{- if eq (env "OPENDESK_ENTERPRISE") "true" }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
username: {{ env "ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }} username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }} password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.dovecot.registry }}/{{ .Values.charts.dovecot.repository }}" url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.dovecot.registry }}/{{ .Values.charts.dovecot.repository }}"
{{- else }} {{- else }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }} username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
@@ -24,8 +24,8 @@ repositories:
verify: {{ .Values.charts.oxAppSuite.verify }} verify: {{ .Values.charts.oxAppSuite.verify }}
oci: true oci: true
{{- if eq (env "OPENDESK_ENTERPRISE") "true" }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
username: {{ env "ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }} username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }} password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.oxAppSuite.registry }}/{{ .Values.charts.oxAppSuite.repository }}" url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.oxAppSuite.registry }}/{{ .Values.charts.oxAppSuite.repository }}"
{{- else }} {{- else }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }} username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}