Refactor pgstacbootstrap job and ConfigMaps to use Helm hooks for execution order

Author: emmanuelmathot

helm-chart/eoapi/templates/pgstacboostrap/configmap.yaml

@@ -1,9 +1,16 @@
 {{- if .Values.pgstacBootstrap.enabled }}
 ---
+# These ConfigMaps provide the necessary data and scripts for the pgstacbootstrap job.
+# They use Helm hooks with a weight of "-6" (lower than the job's "-5") to ensure
+# they are created before the job that depends on them.
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: initdb-sql-config-{{ $.Release.Name }}
+  annotations:
+    helm.sh/hook: "post-install,post-upgrade"
+    helm.sh/hook-weight: "-6"
+    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   initdb.sql: |
     {{- range $path, $bytes := $.Files.Glob "initdb-data/*.sql"  -}}
@@ -14,6 +21,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: initdb-json-config-{{ $.Release.Name }}
+  annotations:
+    helm.sh/hook: "post-install,post-upgrade"
+    helm.sh/hook-weight: "-6"
+    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   {{- range $path, $bytes := $.Files.Glob "initdb-data/*.json"  -}}
   {{- base $path | nindent 2 -}}: | {{- $.Files.Get $path | nindent 4 -}}
@@ -23,6 +34,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: pgstac-setup-config-{{ $.Release.Name }}
+  annotations:
+    helm.sh/hook: "post-install,post-upgrade"
+    helm.sh/hook-weight: "-6"
+    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   pgstac-migrate.py: |
     {{- range $path, $bytes := $.Files.Glob "initdb-data/*.py"  -}}
@@ -33,6 +48,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: initdb-sh-config-{{ $.Release.Name }}
+  annotations:
+    helm.sh/hook: "post-install,post-upgrade"
+    helm.sh/hook-weight: "-6"
+    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   run-forever.sh: |
     #!/bin/bash

helm-chart/eoapi/templates/pgstacboostrap/job.yaml

@@ -1,27 +1,32 @@
 {{- if .Values.pgstacBootstrap.enabled }}
 ---
+# This job initializes the PostgreSQL database with the necessary schema and data.
+# Instead of using an initContainer in the deployment to wait for this job to complete,
+# we use Helm hooks to control the execution order:
+# 
+# 1. The "post-install,post-upgrade" hook ensures this job runs after the postgres 
+#    dependency is installed but before other resources (like deployments)
+# 2. The "-5" hook-weight ensures this job runs after its ConfigMaps (weight -6)
+# 3. The "before-hook-creation,hook-succeeded" delete policy ensures the job is recreated
+#    on each helm install/upgrade and is cleaned up after successful completion
+#
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: pgstacbootstrap
   labels:
     app: pgstacbootstrap
+  annotations:
+    helm.sh/hook: "post-install,post-upgrade"
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 spec:
   template:
     metadata:
       labels:
         app: pgstacbootstrap
     spec:
       restartPolicy: Never
-      initContainers:
-        - name: wait-for-db
-          image: busybox
-          command:
-            {{ if .Values.testing }}
-            ['sh', '-c', 'until nc -z {{ $.Release.Name }}-pgbouncer 5432; do echo waiting for db; sleep 10; done;']
-            {{ else }}
-            ['sh', '-c', 'until nc -z eoapi-pgbouncer 5432; do echo waiting for db; sleep 10; done;']
-            {{ end }}
       containers:
         - name: pgstacbootstrap
           image: {{ .Values.pgstacBootstrap.image.name }}:{{ .Values.pgstacBootstrap.image.tag }}

helm-chart/eoapi/templates/services/deployment.yaml

@@ -9,10 +9,14 @@ metadata:
     app: {{ $serviceName }}-{{ $.Release.Name }}
     gitsha: {{ $.Values.gitSha }}
   name: {{ $serviceName }}-{{ $.Release.Name }}
-  {{- with index $v "annotations" }}
   annotations:
+    # These hooks ensure the deployment runs after the pgstacbootstrap job (which has weight -5)
+    # No initContainer is needed anymore since Helm will handle the execution order
+    # helm.sh/hook: "post-install,post-upgrade"
+    # helm.sh/hook-weight: "10"
+    {{- with index $v "annotations" }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
 spec:
   progressDeadlineSeconds: 600
   revisionHistoryLimit: 5
@@ -30,19 +34,6 @@ spec:
         app: {{ $serviceName }}-{{ $.Release.Name }}
     spec:
       serviceAccountName: eoapi-sa-{{ $.Release.Name }}
-      initContainers:
-      - name: wait-for-pgstacbootstrap
-        image: bitnami/kubectl:latest
-        command:
-        - /bin/sh
-        - -c
-        - |
-          echo "Waiting for pgstacbootstrap job to complete..."
-          while ! kubectl -n {{ $.Release.Namespace }} wait --for=condition=complete job/pgstacbootstrap --timeout=5s; do
-            echo "pgstacbootstrap job not completed yet. Checking again in 10 seconds..."
-            sleep 10
-          done
-          echo "pgstacbootstrap job completed successfully"
       containers:
       - image: {{ index $v "image" "name" }}:{{ index $v "image" "tag" }}
         name: {{ $serviceName }}