diff --git a/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl index 4062cc56..0c924d94 100644 --- a/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl +++ b/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl @@ -52,7 +52,7 @@ stackDataContext: umcPostgresqlHostname: {{ .Values.databases.umsSelfservice.host | quote }} umcPostgresqlUsername: {{ .Values.databases.umsSelfservice.username | quote }} umcMemcachedHostname: {{ .Values.cache.umsSelfservice.host | quote }} - umcMemcachedUsername: "selfservice" + umcMemcachedUsername: "" stackDataUms: loadDevData: true diff --git a/helmfile/apps/univention-management-stack/values-umc-server.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-umc-server.yaml.gotmpl index 0aad3df7..08b8856b 100644 --- a/helmfile/apps/univention-management-stack/values-umc-server.yaml.gotmpl +++ b/helmfile/apps/univention-management-stack/values-umc-server.yaml.gotmpl @@ -39,23 +39,21 @@ extraVolumeMounts: mountPath: "/usr/share/univention-management-console/modules/udm-portals-announcement.xml" subPath: "udm-portals-announcement.xml" +imagePullSecrets: + {{- range .Values.global.imagePullSecrets }} + - {{ . }} + {{- end }} + image: registry: {{ .Values.global.imageRegistry | default .Values.images.umsUmcServer.registry | quote }} repository: {{ .Values.images.umsUmcServer.repository | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} tag: {{ .Values.images.umsUmcServer.tag | quote }} - pullSecrets: - {{- range .Values.global.imagePullSecrets }} - - name: {{ . | quote }} - {{- end }} memcached: bundled: false auth: - username: null - # This is also used by the umc-server Helm chart to generate a secret. The secrets content is represented as an environment variable. If said variable is empty, the container fails to start due to an entrypoint script erroring on a nullish value for the environment variable SELF_SERVICE_MEMCACHED_SECRET. - password: "password" - server: {{ .Values.cache.umsSelfservice.host | quote }} + password: null postgresql: bundled: false diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index fc92fb37..944f0745 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -618,7 +618,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "umc-gateway" - version: "0.11.2" + version: "0.11.6" verify: true umsUmcServer: # providerCategory: 'Supplier' @@ -630,7 +630,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "umc-server" - version: "0.11.2" + version: "0.11.6" verify: true xwiki: # providerCategory: 'Supplier' diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index bd1a3569..e040fcc4 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -714,7 +714,7 @@ images: # upstreamMirrorStartFrom: ['0', '7', '3'] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway" - tag: "0.11.2@sha256:13edaa88ded4b3389ef36d0215ad19ea093ae962f8de9b4b178550e02de06277" + tag: "0.11.6@sha256:5d7c1a9b74409d2d7c42e08ca87b41cda506e43cad49efbc85a4ed6b8e9c6bc8" umsUmcServer: # providerCategory: 'Supplier' # providerResponsible: 'Univention' @@ -724,7 +724,7 @@ images: # upstreamMirrorStartFrom: ['0', '7', '3'] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server" - tag: "0.11.2@sha256:866b8c3d2845653c68316458d7a24901b0493d2e2b83d50e0932adc42cda1706" + tag: "0.11.6@sha256:f598a39206cf1acc901876e5d54b6c6e47980e979b5e29677f7738c3acaf75d3" umsWaitForDependency: # providerCategory: 'Supplier' # providerResponsible: 'Univention'