diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a97f04b..7813ef5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -299,12 +299,12 @@ env-start: # Set credentials for openDesk Enterprise Registry - | if [ "${OPENDESK_ENTERPRISE}" = "true" ]; then - kubectl create secret - --namespace "${NAMESPACE}" - docker-registry enterprise-registry - --docker-server "registry.opencode.de" - --docker-username "${OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME}" - --docker-password "${OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD}" + kubectl create secret \ + --namespace "${NAMESPACE}" \ + docker-registry enterprise-registry \ + --docker-server "registry.opencode.de" \ + --docker-username "${OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME}" \ + --docker-password "${OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD}" \ --dry-run=client -o yaml | kubectl apply -f - fi stage: "env" diff --git a/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl b/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl index 3de049e8..78b271e2 100644 --- a/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl @@ -9,8 +9,8 @@ repositories: verify: {{ .Values.charts.dovecot.verify }} oci: true {{- if eq (env "OPENDESK_ENTERPRISE") "true" }} - username: {{ env "ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }} - password: {{ env "ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }} + username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | 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 }}" {{- else }} username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }} @@ -24,8 +24,8 @@ repositories: verify: {{ .Values.charts.oxAppSuite.verify }} oci: true {{- if eq (env "OPENDESK_ENTERPRISE") "true" }} - username: {{ env "ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }} - password: {{ env "ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }} + username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | 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 }}" {{- else }} username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}