[daemons]: optional image registry

rucio · Feb 25, 2025 · 628179a · 628179a
1 parent a9e9876
commit 628179a
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 19 deletions.
diff --git a/charts/rucio-daemons/Chart.yaml b/charts/rucio-daemons/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-daemons
-version: 36.0.3
+version: 36.0.4
 apiVersion: v1
 description: A Helm chart to deploy daemons for Rucio
 keywords:

diff --git a/charts/rucio-daemons/templates/_helpers.tpl b/charts/rucio-daemons/templates/_helpers.tpl
@@ -41,3 +41,13 @@ Get CronJob Kube API Version
     {{- print "batch/v1beta1" -}}
   {{- end -}}
 {{- end -}}
+
+{{/*
+Image Registry
+Ensures the registry ends with a `/` if set.
+*/}}
+{{- define "rucio.image.registry" -}}
+  {{- if .Values.imageRegistry -}}
+    {{- trimSuffix "/" .Values.imageRegistry }}/
+  {{- end -}}
+{{- end -}}
diff --git a/charts/rucio-daemons/templates/abacus-deployment.yaml b/charts/rucio-daemons/templates/abacus-deployment.yaml
@@ -105,7 +105,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml b/charts/rucio-daemons/templates/automatic-restart-cronjob.yaml
@@ -12,7 +12,7 @@ spec:
           serviceAccountName: {{ template "rucio.fullname" . }}-rucio-restart
           containers:
             - name: restart-pods
-              image: "{{ .Values.automaticRestart.image.repository }}:{{ .Values.automaticRestart.image.tag }}"
+              image: "{{ include "rucio.image.registry" . }}{{ .Values.automaticRestart.image.repository }}:{{ .Values.automaticRestart.image.tag }}"
               imagePullPolicy: {{ .Values.automaticRestart.image.pullPolicy }}
               args:
                 - rollout

diff --git a/charts/rucio-daemons/templates/automatix-deployment.yaml b/charts/rucio-daemons/templates/automatix-deployment.yaml
@@ -110,7 +110,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/cache-consumer-deployment.yaml b/charts/rucio-daemons/templates/cache-consumer-deployment.yaml
@@ -99,7 +99,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - name: config-common

diff --git a/charts/rucio-daemons/templates/conveyor-deployment.yaml b/charts/rucio-daemons/templates/conveyor-deployment.yaml
@@ -105,7 +105,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/dark-reaper-deployment.yaml b/charts/rucio-daemons/templates/dark-reaper-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/hermes-deployment.yaml b/charts/rucio-daemons/templates/hermes-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
 {{ if $component_values.useSSL }}

diff --git a/charts/rucio-daemons/templates/hermes-legacy-deployment.yaml b/charts/rucio-daemons/templates/hermes-legacy-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
 {{ if $component_values.useSSL }}

diff --git a/charts/rucio-daemons/templates/judge-deployment.yaml b/charts/rucio-daemons/templates/judge-deployment.yaml
@@ -105,7 +105,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/minos-deployment.yaml b/charts/rucio-daemons/templates/minos-deployment.yaml
@@ -105,7 +105,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce (.component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/necromancer-deployment.yaml b/charts/rucio-daemons/templates/necromancer-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/oauth-manager-deployment.yaml b/charts/rucio-daemons/templates/oauth-manager-deployment.yaml
@@ -104,7 +104,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/reaper-deployment.yaml b/charts/rucio-daemons/templates/reaper-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/renew-fts-cronjob.yaml b/charts/rucio-daemons/templates/renew-fts-cronjob.yaml
@@ -46,7 +46,7 @@
   {{- end}}
   containers:
     - name: renew-fts-cron
-      image: "{{ .Values.ftsRenewal.image.repository }}:{{ .Values.ftsRenewal.image.tag }}"
+      image: "{{ include "rucio.image.registry" . }}{{ .Values.ftsRenewal.image.repository }}:{{ .Values.ftsRenewal.image.tag }}"
       imagePullPolicy: {{ .Values.ftsRenewal.image.pullPolicy }}
       resources:
 {{ toYaml .Values.ftsRenewal.resources | indent 8 }}

diff --git a/charts/rucio-daemons/templates/replica-recoverer-deployment.yaml b/charts/rucio-daemons/templates/replica-recoverer-deployment.yaml
@@ -108,7 +108,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/tracer-kronos-deployment.yaml b/charts/rucio-daemons/templates/tracer-kronos-deployment.yaml
@@ -94,7 +94,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - name: config-common

diff --git a/charts/rucio-daemons/templates/transmogrifier-deployment.yaml b/charts/rucio-daemons/templates/transmogrifier-deployment.yaml
@@ -107,7 +107,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
           {{- if .Values.useDeprecatedImplicitSecrets }}

diff --git a/charts/rucio-daemons/templates/undertaker-deployment.yaml b/charts/rucio-daemons/templates/undertaker-deployment.yaml
@@ -104,7 +104,7 @@ spec:
       {{- end}}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
+          image: "{{ include "rucio.image.registry" . }}{{ .Values.image.repository }}:{{ coalesce ($component_values.image | default dict).tag .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - name: config-common

diff --git a/charts/rucio-daemons/values.yaml b/charts/rucio-daemons/values.yaml
@@ -40,6 +40,9 @@ image:
 imagePullSecrets: []
 # - name: docker-regcreds
 
+imageRegistry: ""
+# imageRegistry: registry.cern.ch/docker.io
+
 strategy:
   type: RollingUpdate
   rollingUpdate: