diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index c7777293..84328ad8 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -239,66 +239,6 @@ nubusPortalFrontend: enabled: {{ .Values.ingress.tls.enabled }} secretName: {{ .Values.ingress.tls.secretName }} - # TODO: Remove the block "items" once the "redirects" section has been - # corrected. - # - # This does override the path configuration of the ingress - # "ums-portal-frontend-redirects" to avoid that "/univention/*" is - # redirected to "/univention/portal/". - items: - - name: rewrites - # -- Define the Fully Qualified Domain Name (FQDN) where application should be reachable. - host: "" - - # -- Define the Ingress paths. - paths: - - path: /univention/(portal|selfservice)/ - pathType: ImplementationSpecific - - path: /univention/(portal|selfservice)/index.html - pathType: ImplementationSpecific - - path: /univention/(portal|selfservice)/(css|fonts|i18n|media|js|oidc|custom)(/.*) - pathType: ImplementationSpecific - - path: /univention/(portal)/(icons)(/.*)$ - pathType: ImplementationSpecific - - # -- The Ingress controller class name. - ingressClassName: "" - - # -- Define custom ingress annotations. - # annotations: - # nginx.ingress.kubernetes.io/rewrite-target: / - annotations: - nginx.ingress.kubernetes.io/rewrite-target: "/$2$3" - nginx.ingress.kubernetes.io/use-regex: "true" - - # -- Secure an Ingress by specifying a Secret that contains a TLS private key and certificate. - # - # Ref.: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls - tls: - # enabled: true - # Set to override the global secretName - secretName: "" - - name: redirects - host: "" - paths: - - pathType: Exact - path: /$ - - pathType: Exact - path: /univention$ - - pathType: Exact - path: /univention/$ - - pathType: Exact - path: /univention/portal$ - - pathType: Exact - path: /univention/selfservice$ - ingressClassName: "" - annotations: - nginx.ingress.kubernetes.io/permanent-redirect: "/univention/portal/" - tls: - # enabled: true - # Set to override the global secretName - secretName: "" - nubusKeycloakExtensions: keycloak: auth: @@ -521,15 +461,6 @@ nubusUmcGateway: enabled: {{ .Values.ingress.tls.enabled }} secretName: {{ .Values.ingress.tls.secretName | quote }} - # TODO: Remove the block "paths" once it has been corrected upstream. - paths: - - path: /()(univention/)(languages.json|meta.json|theme.css) - pathType: ImplementationSpecific - - path: /()(univention/)((js|management|themes)/.*) - pathType: ImplementationSpecific - - path: /()(univention/login/)(dialog.js|main.js|LoginDialog.js|i18n/.*?/main.json) - pathType: ImplementationSpecific - nubusKeycloakBootstrap: additionalAnnotations: argocd.argoproj.io/hook: "Sync" diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index db60cb35..56353afa 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -264,7 +264,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "nubus" - version: "0.63.2" + version: "0.64.2" verify: true opendeskKeycloakBootstrap: # providerCategory: "Platform" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index d3a376a6..cecbaf34 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -253,7 +253,7 @@ images: # upstreamMirrorStartFrom: ["0", "41", "5"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader" - tag: "0.70.0@sha256:d1d916f11d3b035eb95b46fbc3da2f9c797f89d3f3ac56b9ab1c89482413bac6" + tag: "0.73.0@sha256:9babbdd0879aed7da928bf5034bf5f311511a8d07c242d2b10d067cc5dc0fd41" nubusGuardianAuthorizationApi: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -395,7 +395,7 @@ images: # upstreamMirrorStartFrom: ["0", "9", "4"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api" - tag: "0.41.0@sha256:2cc3c6fba7199f2747b7da4ae43b0faeeaf623411dbe16d702e454e8bfdd92ef" + tag: "0.42.2@sha256:ff744b2d5388bfc413a4d25108f37ba086d2a08cb14ceb02d17e93de003a1078" nubusOpendeskExtension: # providerCategory: "Platform" # providerResponsible: "openDesk" @@ -433,7 +433,7 @@ images: # upstreamMirrorStartFrom: ["0", "27", "0"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer" - tag: "0.41.0@sha256:7e722ea44e46985b0831c59a8eb1d404e9a671f6cccf1737502b286225fb68c9" + tag: "0.42.2@sha256:5afee47e4d3d5f8bf51ffca66578a98318f49ee41e8f4b306cb75826b66a1804" nubusPortalExtension: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -453,7 +453,7 @@ images: # upstreamMirrorStartFrom: ["0", "9", "4"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend" - tag: "0.41.0@sha256:37e9603aab4868c7a31405c9a1c5b6012e12db09164e4abed78cc4cfca4c01de" + tag: "0.42.2@sha256:0339694a2b1a657a77bef2a65c85270cfec9c08e965550695b18c2360440cb65" nubusPortalServer: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -463,7 +463,7 @@ images: # upstreamMirrorStartFrom: ["0", "9", "4"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server" - tag: "0.41.0@sha256:b55a6baa433410e600fc5742e084ee1617e3875e6f9fd2c16e0397e8776ca86f" + tag: "0.42.2@sha256:00b45c354c421ad6bc0ee046444cc0a2caf633787c770cad60e7c06c4307a248" nubusProvisioningDispatcher: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -523,7 +523,7 @@ images: # upstreamMirrorStartFrom: ["0", "3", "2"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation" - tag: "0.11.2@sha256:f6c6c9bbfca8ea6568b7b5f09a5bf64f76a7d9a9b55e18981f9e8635ff103bb0" + tag: "0.11.3@sha256:cd51246ae9436426bd7ee12bc85466cafc18a43ba05ab3ede35dfcf3a012656f" nubusUdmRestApi: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -533,7 +533,7 @@ images: # upstreamMirrorStartFrom: ["0", "9", "3"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/udm-rest-api" - tag: "0.24.0@sha256:113251d8052f69ac0c7af721954d1711231ca72de1ce6565bb86cdadf53a0ad9" + tag: "0.25.1@sha256:0078b16ecf5539e6f3c7e6d5a7ddb57937d3d2d143754fbd6d439a3a8741abe8" nubusUmcGateway: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -543,7 +543,7 @@ images: # upstreamMirrorStartFrom: ["0", "7", "3"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway" - tag: "0.32.0@sha256:d47716784ea86659ef93b1e79b0edd72a69d5e8169704accaf6213f01d4e395e" + tag: "0.34.1@sha256:ab4ffccc182bae115dc8f264c051f1c23102b1416ac00709d95285218829ce39" nubusUmcServer: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -553,7 +553,7 @@ images: # upstreamMirrorStartFrom: ["0", "7", "3"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server" - tag: "0.34.0@sha256:dc2d2673f6ff3a901c1198606c624cf6abc2d869cd93c6299e641114853ede7e" + tag: "0.34.1@sha256:4addb518b7b622f0e82dbdde30bbb8d8da6cc197528268d2ad856635f3bbe64a" nubusUmcServerProxy: # providerCategory: "Supplier" # providerResponsible: "Univention"