Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Thorsten Roßner <thorsten.rossner.extern@zendis.de>

dev/charts-local.py

@@ -129,7 +129,7 @@ def grep_yaml(file):
     with open(file, 'r') as file:
         content = ''
         for line in file.readlines():
-            if not ': {{' in line and not '- {{' in line:
+            if not '{{' in line:
                 content += line
     return yaml.safe_load(content)
 

helmfile/apps/jitsi/values-jitsi.yaml.gotmpl

@@ -302,6 +302,11 @@ jitsi:
   {{- end }}
 
 patchJVB:
+  {{- with .Values.patchJVB }}
+  {{- if hasKey . "backoffLimit" }}
+  backoffLimit: {{ .backoffLimit }}
+  {{- end }}
+  {{- end }}
   configuration:
     staticLoadbalancerIP: {{ .Values.cluster.networking.ingressGatewayIP | quote }}
     loadbalancerStatusField: {{ .Values.cluster.networking.loadBalancerStatusField | quote }}

helmfile/apps/xwiki/values.yaml.gotmpl

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
 ---
@@ -6,8 +6,15 @@ commonAnnotations:
   {{ .Values.annotations.xwiki.common | toYaml | nindent 2 }}
 
 image:
-  name: "{{ .Values.images.xwiki.registry }}/{{ .Values.images.xwiki.repository }}"
-  tag: {{ .Values.images.xwiki.tag | quote }}
+  {{- if eq .Values.databases.xwiki.type "mariadb" }}
+  name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiMariadb.registry }}/{{ .Values.images.xwikiMariadb.repository }}"
+  tag: {{ .Values.images.xwikiMariadb.tag | quote }}
+  {{- else if eq .Values.databases.xwiki.type "postgresql" }}
+  name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiPostgres.registry }}/{{ .Values.images.xwikiPostgres.repository }}"
+  tag: {{ .Values.images.xwikiPostgres.tag | quote }}
+  {{- else }}
+  {{- fail "Unsupported value for .Values.databases.xwiki.type, supported values are 'mariadb' or 'postgresql'" }}
+  {{- end }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 imagePullSecrets:
   {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}

helmfile/environments/default/charts.yaml.gotmpl

@@ -149,7 +149,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-jitsi"
     name: "opendesk-jitsi"
-    version: "3.1.0"
+    version: "3.2.0"
     verify: true
   mariadb:
     # providerCategory: "Platform"

helmfile/environments/default/images.yaml.gotmpl

@@ -997,12 +997,24 @@ images:
     registry: "registry-1.docker.io"
     repository: "library/nginx"
     tag: "1.28.0-alpine3.21@sha256:aed99734248e851764f1f2146835ecad42b5f994081fa6631cc5d79240891ec9"
-  xwiki:
+  xwikiMariadb:
     # providerCategory: "Supplier"
     # providerResponsible: "XWiki"
     # upstreamRegistry: "https://git.xwikisas.com:5050"
-    # upstreamRepository: "xwikisas/swp/xwiki-solr"
-    registry: "git.xwikisas.com:5050"
-    repository: "xwikisas/swp/xwiki-solr"
-    tag: "1.0.0"
+    # upstreamRepository: "xwikisas/swp/xwiki"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-mariadb.+$'
+    # upstreamMirrorStartFrom: ["0", "12"]
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
+    tag: "0.25-mariadb-jetty-alpine@sha256:7175ef5e454b4eb0f6fd6a92a9503d8a680db3ca97b25c3a4eedac9c9bfbcdaf"
+  xwikiPostgres:
+    # providerCategory: "Supplier"
+    # providerResponsible: "XWiki"
+    # upstreamRegistry: "https://git.xwikisas.com:5050"
+    # upstreamRepository: "xwikisas/swp/xwiki"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-postgres.+$'
+    # upstreamMirrorStartFrom: ["0", "23"]
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
+    tag: "0.25-postgres-jetty-alpine@sha256:1bfc57a65f8bc6b059d550791699b5afa33b91db8d4c75ca8f6f3d2299f7c335"
 ...