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

fix: update chart ums, update provisioning and selfservice-listener images, update values-umbrella for selfservice-listener

Browse Source
This commit is contained in:
Anton Caceres
2024-05-09 22:12:57 +02:00
parent d82d9e7e24
commit 5766d0fedd
5 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
View File

@@ -698,27 +698,19 @@ selfservice-listener:
podAnnotations: podAnnotations:
intents.otterize.com/service-name: "ums-selfservice-listener" intents.otterize.com/service-name: "ums-selfservice-listener"
image: image:
registry: {{ .Values.global.imageRegistry | default .Values.images.umsSelfserviceInvitation.registry | quote }}
repository: {{ .Values.images.umsSelfserviceInvitation.repository | quote }}
tag: {{ .Values.images.umsSelfserviceInvitation.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
pullSecrets: pullSecrets:
{{- range .Values.global.imagePullSecrets }} {{- range .Values.global.imagePullSecrets }}
- name: {{ . | quote }} - name: {{ . | quote }}
{{- end }} {{- end }}
selfserviceListener: config:
registry: {{ .Values.global.imageRegistry | default .Values.images.umsSelfserviceListener.registry | quote }} provisioningApiBaseUrl: "http://ums-provisioning-api"
repository: {{ .Values.images.umsSelfserviceListener.repository | quote }} umcServerUrl: "http://ums-umc-server"
tag: {{ .Values.images.umsSelfserviceListener.tag | quote }} credentialSecretName: "ums-selfservice-listener-credentials"
selfserviceInvitation:
registry: {{ .Values.global.imageRegistry | default .Values.images.umsSelfserviceInvitation.registry | quote }}
repository: {{ .Values.images.umsSelfserviceInvitation.repository | quote }}
tag: {{ .Values.images.umsSelfserviceInvitation.tag | quote }}
waitForDependency:
registry: {{ .Values.global.imageRegistry | default .Values.images.umsWaitForDependency.registry | quote }}
repository: {{ .Values.images.umsWaitForDependency.repository | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
tag: {{ .Values.images.umsWaitForDependency.tag | quote }}
persistence: persistence:
storageClassName: {{ .Values.persistence.storageClassNames.RWO | quote }} storageClassName: {{ .Values.persistence.storageClassNames.RWO | quote }}
@@ -727,24 +719,8 @@ selfservice-listener:
resources: resources:
{{ .Values.resources.umsSelfserviceListener | toYaml | nindent 4 }} {{ .Values.resources.umsSelfserviceListener | toYaml | nindent 4 }}
resourcesDependencyWaiter:
{{ .Values.resources.umsSelfserviceListenerDependencies | toYaml | nindent 4 }}
replicaCount: {{ .Values.replicas.umsSelfserviceListener }} replicaCount: {{ .Values.replicas.umsSelfserviceListener }}
selfserviceListener:
ldapBaseDn: {{ .Values.ldap.baseDn | quote }}
ldapHost: {{ .Values.ldap.host | quote }}
ldapHostDn: {{ printf "%s,%s" "cn=admin" .Values.ldap.baseDn | quote }}
ldapPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
machineSecret: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
notifierServer: {{ .Values.ldap.notifierHost | quote }}
umcAdminPassword: {{ .Values.secrets.univentionManagementStack.defaultAccounts.adminPassword | quote }}
debugLevel: {{ if .Values.debug.enabled }}"4"{{ else }}"1"{{ end }}
tlsMode: "off"
umcServerUrl: "http://ums-umc-server"
umcAdminUser: "default.admin"
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
@@ -1578,4 +1554,10 @@ extraSecrets:
stringData: stringData:
KEYCLOAK_ADMIN_PASSWORD: {{ .Values.secrets.keycloak.adminPassword | quote }} KEYCLOAK_ADMIN_PASSWORD: {{ .Values.secrets.keycloak.adminPassword | quote }}
GUARDIAN_MANAGEMENT_API_CLIENT_SECRET: {{ .Values.secrets.keycloak.clientSecret.guardian | quote }} GUARDIAN_MANAGEMENT_API_CLIENT_SECRET: {{ .Values.secrets.keycloak.clientSecret.guardian | quote }}
- name: "ums-selfservice-listener-credentials"
stringData:
UMC_ADMIN_USER: "Administrator"
UMC_ADMIN_PASSWORD: {{ .Values.secrets.univentionManagementStack.selfserviceListener.umcAdminPassword | quote }}
PROVISIONING_API_USERNAME: "selfservice-listener"
PROVISIONING_API_PASSWORD: {{ .Values.secrets.univentionManagementStack.selfserviceListener.provisioningApiPassword | quote }}
... ...

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

@@ -375,10 +375,16 @@ charts:
# upstreamRepository: 'souvap/tooling/charts/univention/ums' # upstreamRepository: 'souvap/tooling/charts/univention/ums'
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$' # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
# upstreamMirrorStartFrom: ['0', '0', '1'] # upstreamMirrorStartFrom: ['0', '0', '1']
registry: "registry.opencode.de" # TODO: return back mirror registry and repository before merging
repository: "bmi/opendesk/components/supplier/univention/charts-mirror" # registry: "registry.opencode.de"
# repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
registry: "registry.souvap-univention.de"
repository: "souvap/tooling/charts/univention"
name: "ums" name: "ums"
version: "0.12.0" # TODO: Needs an update once the previous MR is merged
# See: https://git.knut.univention.de/univention/customers/dataport/upx/ums-stack/-/merge_requests/32
# version: "0.12.1"
version: "0.12.1-pre-acaceres-update-dependencies"
verify: true verify: true
umsKeycloakBootstrap: umsKeycloakBootstrap:
# providerCategory: 'Supplier' # providerCategory: 'Supplier'

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

@@ -670,7 +670,7 @@ images:
# upstreamMirrorStartFrom: ['0', '14', '0'] # upstreamMirrorStartFrom: ['0', '14', '0']
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher" repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
tag: "0.21.3@sha256:29c5f216ab0f8d12c1e77969de6e82046c0d47e1111838fb0a2dcd9950c0175d" tag: "0.25.0@sha256:c6c9d1e4a46222105ded32c8e87cb2e9b19945592a9ada4e6c13e6942d721694"
umsProvisioningEventsAndConsumerApi: umsProvisioningEventsAndConsumerApi:
# providerCategory: 'Supplier' # providerCategory: 'Supplier'
# providerResponsible: 'Univention' # providerResponsible: 'Univention'
@@ -680,7 +680,7 @@ images:
# upstreamMirrorStartFrom: ['0', '14', '0'] # upstreamMirrorStartFrom: ['0', '14', '0']
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api" repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
tag: "0.21.3@sha256:4cb498a64dd40c0963ca1ca382213ad5b8a4de5eb57650946d78ac44b359f43f" tag: "0.25.0@sha256:f0382154126421e4078beede3ce2579f61859da64c497cb5c93acc693bf71647"
umsProvisioningPrefill: umsProvisioningPrefill:
# providerCategory: 'Supplier' # providerCategory: 'Supplier'
# providerResponsible: 'Univention' # providerResponsible: 'Univention'
@@ -690,7 +690,7 @@ images:
# upstreamMirrorStartFrom: ['0', '14', '0'] # upstreamMirrorStartFrom: ['0', '14', '0']
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill" repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
tag: "0.21.3@sha256:944ff8558d12c59f3490cba68680281c3fa5468fd6fd011fd002befcb9956973" tag: "0.25.0@sha256:a5beae74c2575fa20d305ae635bc0c2bba64a9b1173819f8ddd4cca3fb59f6a4"
umsProvisioningUdmListener: umsProvisioningUdmListener:
# providerCategory: 'Supplier' # providerCategory: 'Supplier'
# providerResponsible: 'Univention' # providerResponsible: 'Univention'
@@ -700,7 +700,7 @@ images:
# upstreamMirrorStartFrom: ['0', '14', '0'] # upstreamMirrorStartFrom: ['0', '14', '0']
registry: "registry.opencode.de" registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener" repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
tag: "0.21.3@sha256:e1cd42558e44bb72ed5c7798cef711db94df7d10d6895c993ca6412df1d25f02" tag: "0.25.0@sha256:b67e31d11461d02bc211117408ded3c0428d224b056f26734add7c024d5f710a"
umsSelfserviceInvitation: umsSelfserviceInvitation:
# providerCategory: 'Supplier' # providerCategory: 'Supplier'
# providerResponsible: 'Univention' # providerResponsible: 'Univention'
@@ -708,19 +708,15 @@ images:
# upstreamRepository: 'souvap/tooling/images/univention/selfservice-invitation' # upstreamRepository: 'souvap/tooling/images/univention/selfservice-invitation'
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$' # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
# upstreamMirrorStartFrom: ['0', '3', '2'] # upstreamMirrorStartFrom: ['0', '3', '2']
registry: "registry.opencode.de" # TODO: return back mirror registry and repository before merging
repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation" # registry: "registry.opencode.de"
tag: "0.4.0@sha256:bd252758576e1733076c78756f04225ebed73d9c48de22440975ef11dd087caf" # repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
umsSelfserviceListener: registry: "registry.souvap-univention.de"
# providerCategory: 'Supplier' repository: "souvap/tooling/images/univention/selfservice-invitation"
# providerResponsible: 'Univention' # TODO: Needs an update once the previous MR is merged
# upstreamRegistry: 'registry.souvap-univention.de' # See: https://git.knut.univention.de/univention/customers/dataport/upx/selfservice-listener/-/merge_requests/16
# upstreamRepository: 'souvap/tooling/images/univention/selfservice-listener' # version: "0.5.0"
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$' tag: "0.5.0-pre-acaceres-migrate-self-service-listener-to-provisioning-service@sha256:68b342badcaa0def19e6396bb23ffabf3e140ee2a3a39d37e7a5dc4cbba8362b"
# upstreamMirrorStartFrom: ['0', '3', '2']
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-listener"
tag: "0.4.0@sha256:0bc0235fd64a19a183f112da73109b54712c2d70fe7fa77c6405beefb7167588"
umsStackGateway: umsStackGateway:
# providerCategory: 'Community' # providerCategory: 'Community'
# providerResponsible: 'Univention' # providerResponsible: 'Univention'

7
helmfile/environments/default/resources.yaml
View File

@@ -480,13 +480,6 @@ resources:
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "256Mi" memory: "256Mi"
umsSelfserviceListenerDependencies:
limits:
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "256Mi"
umsStackDataUms: umsStackDataUms:
limits: limits:
cpu: 99 cpu: 99

3
helmfile/environments/default/secrets.gotmpl
View File

@@ -42,6 +42,9 @@ secrets:
dispatcherUdmPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "udm" | sha1sum | quote }} dispatcherUdmPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "udm" | sha1sum | quote }}
udmListenerNatsPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "udmlistener" "nats" | sha1sum | quote }} udmListenerNatsPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "udmlistener" "nats" | sha1sum | quote }}
udmPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "udm" | sha1sum | quote }} udmPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "udm" | sha1sum | quote }}
selfserviceListener:
umcAdminPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "Administrator" "umc" | sha1sum | quote }}
provisioningApiPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "selfservice-listener" "selfservice-listener" | sha1sum | quote }}
nats: nats:
natsAdminPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "admin" "nats" | sha1sum | quote }} natsAdminPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "admin" "nats" | sha1sum | quote }}