fix(values): add registry of image #806

The following patch adds the `registry` attribute. It also sets the `registry`
attribute for all helm chart dependencies.

This is necessary to protect CRIO users from a breaking change in v1.34. Further
information can be found here:

cri-o/cri-o#9401

Signed-off-by: Markus Pesch <[email protected]>
Signed-off-by: WrenIX <[email protected]>

Author: volker-raschek

charts/nextcloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 8.5.3
+version: 8.5.4
 # renovate: image=docker.io/library/nextcloud
 appVersion: 32.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.

charts/nextcloud/templates/_helpers.tpl

@@ -43,9 +43,9 @@ Create image name that is used in the deployment
 */}}
 {{- define "nextcloud.image" -}}
 {{- if .Values.image.tag -}}
-{{- printf "%s:%s" .Values.image.repository .Values.image.tag -}}
+{{- printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Values.image.tag -}}
 {{- else -}}
-{{- printf "%s:%s-%s" .Values.image.repository .Chart.AppVersion .Values.image.flavor -}}
+{{- printf "%s/%s:%s-%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Chart.AppVersion .Values.image.flavor -}}
 {{- end -}}
 {{- end -}}
 

charts/nextcloud/templates/deployment.yaml

@@ -288,7 +288,7 @@ spec:
         {{- end }}
         {{- if .Values.mariadb.enabled }}
         - name: mariadb-isalive
-          image: {{ .Values.mariadb.image.registry | default "docker.io" }}/{{ .Values.mariadb.image.repository }}:{{ .Values.mariadb.image.tag }}
+          image: {{ coalesce .Values.global.image.registry .Values.mariadb.image.registry "docker.io" }}/{{ .Values.mariadb.image.repository }}:{{ .Values.mariadb.image.tag }}
           {{- with .Values.nextcloud.mariaDbInitContainer }}
           resources:
             {{- toYaml .resources | nindent 12 }}
@@ -312,7 +312,7 @@ spec:
             - {{ printf "until mysql --host=%s-mariadb --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} --execute=\"SELECT 1;\"; do echo waiting for mysql; sleep 2; done;" .Release.Name }}
         {{- else if .Values.postgresql.enabled }}
         - name: postgresql-isready
-          image: {{ .Values.postgresql.image.registry | default "docker.io"  }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}
+          image: {{ coalesce .Values.global.image.registry .Values.postgresql.image.registry "docker.io"  }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}
           {{- with .Values.nextcloud.postgreSqlInitContainer }}
           resources:
             {{- toYaml .resources | nindent 12 }}

charts/nextcloud/templates/metrics/deployment.yaml

@@ -29,7 +29,7 @@ spec:
       {{- end }}
       containers:
         - name: metrics-exporter
-          image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
+          image: "{{ coalesce .Values.global.image.registry .Values.metrics.image.registry  }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
           imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
           env:
             {{- if or .Values.metrics.token .Values.nextcloud.existingSecret.tokenKey }}

charts/nextcloud/values-metrics.yaml

@@ -0,0 +1,9 @@
+metrics:
+  enabled: true
+  rules:
+    enabled: true
+    labels:
+      prometheus: default
+    defaults:
+      labels:
+        test: demo

charts/nextcloud/values.yaml

@@ -1,7 +1,17 @@
+global:
+  image:
+   # -- if set it will overwrite all registry entries
+    registry:
+
+  security:
+    # required for bitnamilegacy repos
+    allowInsecureImages: true
+
 ## ref: https://hub.docker.com/r/library/nextcloud/tags/
 ##
 image:
-  repository: nextcloud
+  registry: docker.io
+  repository: library/nextcloud
   flavor: apache
   # default is generated by flavor and appVersion
   tag:
@@ -322,7 +332,8 @@ nginx:
   enabled: false
 
   image:
-    repository: nginx
+    registry: docker.io
+    repository: library/nginx
     tag: alpine
     pullPolicy: IfNotPresent
 
@@ -412,11 +423,6 @@ externalDatabase:
     # hostKey: db-hostname-or-ip
     # databaseKey: db-name
 
-global:
-  security:
-    # required for bitnamilegacy repos
-    allowInsecureImages: true
-
 ##
 ## MariaDB chart configuration
 ## ref: https://github.com/bitnami/charts/tree/main/bitnami/mariadb
@@ -428,6 +434,7 @@ mariadb:
   enabled: false
 
   image:
+    registry: docker.io
     repository: bitnamilegacy/mariadb
 
   # see: https://github.com/bitnami/charts/tree/main/bitnami/mariadb#global-parameters
@@ -464,6 +471,7 @@ mariadb:
 postgresql:
   enabled: false
   image:
+    registry: docker.io
     repository: bitnamilegacy/postgresql
   global:
     postgresql:
@@ -518,6 +526,7 @@ externalRedis:
 redis:
   enabled: false
   image:
+    registry: docker.io
     repository: bitnamilegacy/redis
   auth:
     enabled: true
@@ -893,6 +902,7 @@ metrics:
     update: false
 
   image:
+    registry: docker.io
     repository: xperimental/nextcloud-exporter
     tag: 0.8.0
     pullPolicy: IfNotPresent