feat: allow per-image registry type overrides for all diracx images (#239)

Convert services, client, secret_generation, and diracx_base_image from
flat strings to nested objects with repository (and optional registryType),
matching the existing busybox/web pattern. This enables downstream charts
to override the registry for individual images without affecting others.

Author: chrisburr

diracx/Chart.yaml

@@ -11,7 +11,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.0.13"
+version: "1.0.14"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diracx/templates/diracx/_helpers_images.tpl

@@ -12,13 +12,13 @@ If tag, is not specified, it is taken from global images tag, defaulting to Char
 
 Can be used as follows:
 
-{{ include "diracx.image" (dict "registryType" "ghcr" "repository" .Values.global.images.services "root" . ) }}
+{{ include "diracx.image" (dict "registryType" .Values.global.images.services.registryType "repository" .Values.global.images.services.repository "root" . ) }}
 
 Or
 
-{{ include "diracx.image" (dict "repository" .Values.global.images.client "root" . ) }}
+{{ include "diracx.image" (dict "repository" .Values.global.images.client.repository "root" . ) }}
 
-to produce an image path such as (assuming `.Values.global.images.ghcr_registry` is `ghcr.io` and `.Values.global.images.services` is `diracgrid/diracx/services`):
+to produce an image path such as (assuming `.Values.global.images.ghcr_registry` is `ghcr.io` and `.Values.global.images.services.repository` is `diracgrid/diracx/services`):
 
 ghcr.io/diracgrid/diracx/services:v0.0.7
 
@@ -52,31 +52,31 @@ Generates the diracx base image path
 */}}
 
 {{- define "diracx.baseImage" }}
-{{- include "diracx.image" (dict "repository" .Values.global.images.diracx_base_image "root" .  ) }}
+{{- include "diracx.image" (dict "registryType" .Values.global.images.diracx_base_image.registryType "repository" .Values.global.images.diracx_base_image.repository "root" .  ) }}
 {{- end }}
 
 
 {{/*
 Generates the services image path
 */}}
 {{- define "diracx.servicesImage" }}
-{{- include "diracx.image" (dict "repository" .Values.global.images.services "root" .  ) }}
+{{- include "diracx.image" (dict "registryType" .Values.global.images.services.registryType "repository" .Values.global.images.services.repository "root" .  ) }}
 {{- end }}
 
 
 {{/*
 Generates the client image path
 */}}
 {{- define "diracx.clientImage" }}
-{{- include "diracx.image" (dict "repository" .Values.global.images.client "root" .  ) }}
+{{- include "diracx.image" (dict "registryType" .Values.global.images.client.registryType "repository" .Values.global.images.client.repository "root" .  ) }}
 {{- end }}
 
 
 {{/*
 Generates the secret generation image path
 */}}
 {{- define "diracx.secretGenerationImage" }}
-{{- include "diracx.image" (dict "repository" .Values.global.images.secret_generation "root" . "tag" "latest" ) }}
+{{- include "diracx.image" (dict "registryType" .Values.global.images.secret_generation.registryType "repository" .Values.global.images.secret_generation.repository "root" . "tag" "latest" ) }}
 {{- end }}
 
 {{/*

diracx/values.yaml

@@ -23,10 +23,14 @@ global:
     dockerhub_registry: docker.io
 
     # Image repositories
-    services: diracgrid/diracx/services
-    client: diracgrid/diracx/client
-    secret_generation: diracgrid/diracx/secret-generation
-    diracx_base_image: diracgrid/diracx/base
+    services:
+      repository: diracgrid/diracx/services
+    client:
+      repository: diracgrid/diracx/client
+    secret_generation:
+      repository: diracgrid/diracx/secret-generation
+    diracx_base_image:
+      repository: diracgrid/diracx/base
 
     busybox:
       tag: "latest"

docs/admin/reference/values.md

@@ -94,12 +94,12 @@
 | global.images.busybox.registryType | string | `"dockerhub"` |  |
 | global.images.busybox.repository | string | `"busybox"` |  |
 | global.images.busybox.tag | string | `"latest"` |  |
-| global.images.client | string | `"diracgrid/diracx/client"` |  |
-| global.images.diracx_base_image | string | `"diracgrid/diracx/base"` |  |
+| global.images.client.repository | string | `"diracgrid/diracx/client"` |  |
+| global.images.diracx_base_image.repository | string | `"diracgrid/diracx/base"` |  |
 | global.images.dockerhub_registry | string | `"docker.io"` |  |
 | global.images.ghcr_registry | string | `"ghcr.io"` |  |
-| global.images.secret_generation | string | `"diracgrid/diracx/secret-generation"` |  |
-| global.images.services | string | `"diracgrid/diracx/services"` |  |
+| global.images.secret_generation.repository | string | `"diracgrid/diracx/secret-generation"` |  |
+| global.images.services.repository | string | `"diracgrid/diracx/services"` |  |
 | global.images.tag | string | `"v0.0.10"` |  |
 | global.images.web.repository | string | `"diracgrid/diracx-web/static"` |  |
 | global.images.web.tag | string | `"v0.1.0-a10"` |  |