chore: rename initImages values

Signed-off-by: Guilhem Barthés <[email protected]>
Substra · Dec 17, 2024 · ddd0bc1 · ddd0bc1
1 parent ff199b9
commit ddd0bc1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md
@@ -122,11 +122,11 @@ See Bitnami documentation: https://bitnami.com/stack/postgresql/helm
 
 ### Images
 
-| Name                                   | Description                               | Value       |
-| -------------------------------------- | ----------------------------------------- | ----------- |
-| `initImages.initPostgresql.repository` | PostgreSQL image                          | `postgres`  |
-| `initImages.initPostgresql.tag`        | PostgreSQL tag                            | `17`        |
-| `initImages.initPostgresql.registry`   | The registry to pull the PostgreSQL image | `docker.io` |
+| Name                               | Description                               | Value       |
+| ---------------------------------- | ----------------------------------------- | ----------- |
+| `initImages.postgresql.repository` | PostgreSQL image                          | `postgres`  |
+| `initImages.postgresql.tag`        | PostgreSQL tag                            | `17`        |
+| `initImages.postgresql.registry`   | The registry to pull the PostgreSQL image | `docker.io` |
 
 
 ## Usage

diff --git a/charts/orchestrator/templates/_helpers.tpl b/charts/orchestrator/templates/_helpers.tpl
@@ -190,7 +190,7 @@ Disable SSL if using the integrated Postgres, otherwise leave users with the opt
 
 {{- define "substra-orc.waitPostgresqlInitContainer" -}}
 - name: wait-postgresql
-  image: {{ include "substra-orc.images.name" $.Values.images.initPostgresql }}
+  image: {{ include "substra-orc.images.name" (dict "img" $.Values.initImages.postgresql "defaultTag" "latest") }}
   command: ['sh', '-c', 'until pg_isready --host={{ template "substra-orc.database.host" . }} --port={{ .Values.database.port }}; do echo "Waiting for postgresql service"; sleep 2; done;']
   securityContext:
     allowPrivilegeEscalation: false

diff --git a/charts/orchestrator/values.yaml b/charts/orchestrator/values.yaml
@@ -325,10 +325,10 @@ migrations:
 ## @section Images
 ##
 initImages:
-  initPostgresql:
-    ## @param initImages.initPostgresql.repository PostgreSQL image
-    ## @param initImages.initPostgresql.tag PostgreSQL tag
-    ## @param initImages.initPostgresql.registry The registry to pull the PostgreSQL image
+  postgresql:
+    ## @param initImages.postgresql.repository PostgreSQL image
+    ## @param initImages.postgresql.tag PostgreSQL tag
+    ## @param initImages.postgresql.registry The registry to pull the PostgreSQL image
     registry: docker.io
     repository: postgres
     tag: "17"