From 7f17a805970d9e9dc5be06cc9397493456f261fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Mon, 4 Aug 2025 12:58:41 +0200 Subject: [PATCH] chore(mirror): Add mirror annotations to Bitnami images --- helmfile/apps/jitsi/values-jitsi.yaml.gotmpl | 2 +- .../values-dovecot-enterprise.yaml.gotmpl | 2 +- .../values-cassandra.yaml.gotmpl | 4 +- .../values-memcached.yaml.gotmpl | 2 +- .../values-minio.yaml.gotmpl | 4 +- .../values-redis.yaml.gotmpl | 2 +- .../environments/default/images.yaml.gotmpl | 54 ++++++++++++------- 7 files changed, 42 insertions(+), 28 deletions(-) diff --git a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl index 480c508f..96b9ec73 100644 --- a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl +++ b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl @@ -322,7 +322,7 @@ patchJVB: {{ .Values.seLinuxOptions.jitsiPatchJVB | toYaml | nindent 6 }} image: imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.jitsiPatchJVB.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.jitsiPatchJVB.registry | quote }} repository: {{ .Values.images.jitsiPatchJVB.repository | quote }} tag: {{ .Values.images.jitsiPatchJVB.tag | quote }} diff --git a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl index 3643910f..42a01991 100644 --- a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl +++ b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl @@ -8,7 +8,7 @@ image: pullPolicy: {{ .Values.global.imagePullPolicy | quote }} imageInitCassandra: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandra.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandra.registry | quote }} repository: {{ .Values.images.cassandra.repository | quote }} tag: {{ .Values.images.cassandra.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} diff --git a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl index f10d5edf..a1fd9ae8 100644 --- a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl +++ b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl @@ -26,7 +26,7 @@ global: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandra.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandra.registry | quote }} repository: {{ .Values.images.cassandra.repository | quote }} tag: {{ .Values.images.cassandra.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} @@ -62,7 +62,7 @@ livenessProbe: metrics: enabled: false image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandraExporter.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandraExporter.registry | quote }} repository: {{ .Values.images.cassandraExporter.repository | quote }} tag: {{ .Values.images.cassandraExporter.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} diff --git a/helmfile/apps/services-external/values-memcached.yaml.gotmpl b/helmfile/apps/services-external/values-memcached.yaml.gotmpl index 6b7abd62..4837c54b 100644 --- a/helmfile/apps/services-external/values-memcached.yaml.gotmpl +++ b/helmfile/apps/services-external/values-memcached.yaml.gotmpl @@ -28,7 +28,7 @@ global: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.memcached.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.memcached.registry | quote }} repository: {{ .Values.images.memcached.repository | quote }} tag: {{ .Values.images.memcached.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} diff --git a/helmfile/apps/services-external/values-minio.yaml.gotmpl b/helmfile/apps/services-external/values-minio.yaml.gotmpl index 63087278..7b1cfefd 100644 --- a/helmfile/apps/services-external/values-minio.yaml.gotmpl +++ b/helmfile/apps/services-external/values-minio.yaml.gotmpl @@ -46,7 +46,7 @@ global: allowInsecureImages: true image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.minio.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.minio.registry | quote }} repository: {{ .Values.images.minio.repository | quote }} tag: {{ .Values.images.minio.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} @@ -54,7 +54,7 @@ image: volumePermissions: enabled: true image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.minio.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.minio.registry | quote }} repository: {{ .Values.images.bitnamiOSShell.repository | quote }} tag: {{ .Values.images.bitnamiOSShell.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} diff --git a/helmfile/apps/services-external/values-redis.yaml.gotmpl b/helmfile/apps/services-external/values-redis.yaml.gotmpl index f35ce671..d72dc43f 100644 --- a/helmfile/apps/services-external/values-redis.yaml.gotmpl +++ b/helmfile/apps/services-external/values-redis.yaml.gotmpl @@ -16,7 +16,7 @@ global: storageClass: {{ coalesce .Values.persistence.storages.redis.storageClassName .Values.persistence.storageClassNames.RWO | quote }} image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.redis.registry | quote }} + registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.redis.registry | quote }} repository: {{ .Values.images.redis.repository | quote }} tag: {{ .Values.images.redis.tag | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 19f0b0e1..9ef0986d 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -10,25 +10,31 @@ images: # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/os-shell" - registry: "registry-1.docker.io" - repository: "bitnami/os-shell" - tag: "12-debian-12-r44@sha256:6388c7c27a09472906e2f2094410c9ffdadf23b4b242293ce023d0314ec10920" + # upstreamMirrorTagFilterRegEx: '^(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["12", "12", "44"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/os-shell" + tag: "12-debian-12-r44@sha256:e0eab38c4e2e2ebfc9043bc9bc482109ec5cca3123154c1af8e040ea23c5ce98" cassandra: # providerCategory: "Community" # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/cassandra" - registry: "registry-1.docker.io" - repository: "bitnami/cassandra" - tag: "5.0.4-debian-12-r4@sha256:9d909ebe10802dae2fb99ef7c8e9e0dbc496c8d30366e2f7abbe0713b945fa7d" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["5", "0", "4", "12", "4"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/cassandra" + tag: "5.0.4-debian-12-r4@sha256:93be59e318070e5c1d515c2b5840e9e07babfbac845b2c9bcc1cdf8efda6bb18" cassandraExporter: # providerCategory: "Community" # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/cassandra-exporter" - registry: "registry-1.docker.io" - repository: "bitnami/cassandra-exporter" - tag: "2.3.8-debian-12-r46@sha256:e44c65f08d85153041f68bcf180f948341d74018eef8b56e8869ed87fdfd34f0" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["2", "3", "8", "12", "46"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/cassandra-exporter" + tag: "2.3.8-debian-12-r46@sha256:3b460a6287f24ef96626439825c9e3fa822784d802209f38c7541d8289eb51d8" clamd: # providerCategory: "Community" # providerResponsible: "openDesk" @@ -210,8 +216,10 @@ images: # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/kubectl" - registry: "registry-1.docker.io" - repository: "bitnami/kubectl" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$' + # upstreamMirrorStartFrom: ["1", "32", "0"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/kubectl" tag: "1.32.0@sha256:48c81b7aaf4fabf2733a0b888960f6982181fbcd2c3f8dfcebc4a1a065631162" jvb: # providerCategory: "Supplier" @@ -286,9 +294,11 @@ images: # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/memcached" - registry: "registry-1.docker.io" - repository: "bitnami/memcached" - tag: "1.6.38-debian-12-r3@sha256:3e548fba727578be9d996262471f5f3e07726d625702d26743a5e0f34684cb21" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["1", "6", "38", "12", "3"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/memcached" + tag: "1.6.38-debian-12-r3@sha256:ea35c7d38b5e080a900991220323e31539b2877069d8aa4dc6814fe384e3c0da" migrations: # providerCategory: "Platform" # providerResponsible: "openDesk" @@ -310,9 +320,11 @@ images: # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/minio" - registry: "registry-1.docker.io" - repository: "bitnami/minio" - tag: "2025.4.22-debian-12-r1@sha256:d7cd0e172c4cc0870f4bdc3142018e2a37be9acf04d68f386600daad427e0cab" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["2025", "4", "22", "12", "1"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/minio" + tag: "2025.4.22-debian-12-r1@sha256:b5c26fa4a2cc2abffe096a54d9e7fd3976d72e38bd2186338b1a06d66c63e651" nextcloud: # providerCategory: "Platform" # providerResponsible: "openDesk" @@ -936,9 +948,11 @@ images: # providerResponsible: "openDesk" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "bitnami/redis" - registry: "registry-1.docker.io" - repository: "bitnami/redis" - tag: "7.4.3-debian-12-r0@sha256:a25b5d07a14ec13730022c7cd9bab6308d55ccd86b74af7315553c17be884889" + # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$' + # upstreamMirrorStartFrom: ["7", "4", "3", "12", "0"] + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/community/images-mirror/redis" + tag: "7.4.3-debian-12-r0@sha256:fbdf361bbb6a17be28913fb9e4a1cfe3244331d2cbf449ecfe7a1fbbab02efc4" synapse: # providerCategory: "Supplier" # providerResponsible: "Element"