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

fix(univention-management-stack): Add missing image template for ums stack gateway and imagePullSecrets to keycloak extensions

Browse Source
This commit is contained in:
Dominik Kaminski
2024-01-11 16:06:35 +01:00
parent 0492420d60
commit 0bf059e8e1
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helmfile/apps/univention-management-stack/values-ums-keycloak-extensions.yaml.gotmpl
View File

@@ -24,6 +24,7 @@ handler:
repository: {{ .Values.images.umsKeycloakExtensionHandler.repository | quote }} repository: {{ .Values.images.umsKeycloakExtensionHandler.repository | quote }}
tag: {{ .Values.images.umsKeycloakExtensionHandler.tag | quote }} tag: {{ .Values.images.umsKeycloakExtensionHandler.tag | quote }}
imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
imagePullSecrets: {{ .Values.global.imagePullSecrets }}
appConfig: appConfig:
captchaProtectionEnable: false captchaProtectionEnable: false
smtpPassword: {{ .Values.smtp.password | quote }} smtpPassword: {{ .Values.smtp.password | quote }}
@@ -52,6 +53,7 @@ proxy:
repository: {{ .Values.images.umsKeycloakExtensionProxy.repository | quote }} repository: {{ .Values.images.umsKeycloakExtensionProxy.repository | quote }}
tag: {{ .Values.images.umsKeycloakExtensionProxy.tag | quote }} tag: {{ .Values.images.umsKeycloakExtensionProxy.tag | quote }}
imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
imagePullSecrets: {{ .Values.global.imagePullSecrets }}
ingress: ingress:
annotations: annotations:
nginx.org/proxy-buffer-size: "8k" nginx.org/proxy-buffer-size: "8k"

6
helmfile/apps/univention-management-stack/values-ums-stack-gateway.gotmpl
View File

@@ -2,6 +2,12 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
--- ---
image:
registry: {{ .Values.global.imageRegistry | default .Values.images.umsStackGateway.registry | quote }}
repository: {{ .Values.images.umsStackGateway.repository | quote }}
tag: {{ .Values.images.umsStackGateway.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
ingress: ingress:
enabled: {{ .Values.ingress.enabled }} enabled: {{ .Values.ingress.enabled }}
hostname: {{ printf "%s.%s" .Values.global.hosts.univentionManagementStack .Values.global.domain | quote }} hostname: {{ printf "%s.%s" .Values.global.hosts.univentionManagementStack .Values.global.domain | quote }}

4
helmfile/environments/default/charts.yaml
View File

@@ -510,7 +510,7 @@ charts:
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/charts-mirror" repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
name: "keycloak-extensions" name: "keycloak-extensions"
version: "0.0.5" version: "0.0.5-post-feat-add-imagepullsecrets"
verify: true verify: true
# @supplier: "Univention" # @supplier: "Univention"
# @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'
@@ -734,7 +734,7 @@ charts:
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/xwiki/charts-mirror" repository: "bmi/opendesk/components/supplier/xwiki/charts-mirror"
name: "xwiki" name: "xwiki"
version: "1.2.5" version: "1.2.6"
verify: false verify: false
# @supplier: "XWiki" # @supplier: "XWiki"
# @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'

8
helmfile/environments/default/images.yaml
View File

@@ -720,6 +720,14 @@ images:
# @supplier: "Univention" # @supplier: "Univention"
# @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$'
# @mirrorFrom: ['0', '3', '2'] # @mirrorFrom: ['0', '3', '2']
umsStackGateway:
# renovate:
# upstreamRegistry=docker.io
# upstreamRepository=bitnami/nginx
# dependencyType=external
registry: "docker.io"
repository: "bitnami/nginx"
tag: "1.25.3@sha256:40ce0d6b8f5fc174a4df8c59c8893164c540192ee862cb7253650a30d9dc3b73"
umsStoreDav: umsStoreDav:
# renovate: # renovate:
# upstreamRegistry=registry.souvap-univention.de # upstreamRegistry=registry.souvap-univention.de