Merge pull request #10395 from sapcc/postgres-fix-collation-upgrades

postgresql-ng: fix collation refresh for DBs

Author: majewsky

common/postgresql-ng/Chart.yaml

@@ -47,4 +47,4 @@ description: Chart for PostgreSQL
 #
 # 2.2.0
 # - Removed support for PostgreSQL 15, because Alpine 3.23 does not carry packages for it anymore.
-version: 2.2.1 # this version number is SemVer as it gets used to auto bump
+version: 2.2.2 # this version number is SemVer as it gets used to auto bump

common/postgresql-ng/docker/entrypoint.sh

@@ -218,7 +218,9 @@ if [[ $updated_db == true ]]; then
   fi
 
   PGDATABASE='postgres' process_sql -c "ALTER DATABASE \"template1\" REFRESH COLLATION VERSION"
-  PGDATABASE="$DB" process_sql -c "ALTER DATABASE \"$DB\" REFRESH COLLATION VERSION"
+  for DB in $DATABASES; do
+    PGDATABASE="$DB" process_sql -c "ALTER DATABASE \"$DB\" REFRESH COLLATION VERSION"
+  done
 fi
 
 # maintain password of superuser account "postgres" (this is required because this password is different on each run)
@@ -231,9 +233,8 @@ if [[ -f /sql-on-startup.d/phase1-system.sql ]]; then
   echo "Processing /sql-on-startup.d/phase1-system.sql..."
   PGDATABASE='postgres' process_sql -f <(substituteSqlEnvs /sql-on-startup.d/phase1-system.sql)
 fi
-for FILE in /sql-on-startup.d/phase2-*.sql; do
-  DB="$(basename "$FILE" | sed 's/^phase2-\(.*\)\.sql$/\1/')"
-  PGDATABASE="$DB" process_sql -f "$FILE"
+for DB in $DATABASES; do
+  PGDATABASE="$DB" process_sql -f "/sql-on-startup.d/phase2-$DB.sql"
 done
 
 # stop and exec later to properly attach to forward signals and stdout/stderr properly

common/postgresql-ng/templates/deployment.yaml

@@ -75,6 +75,8 @@ spec:
         image: "{{ include "preferredRegistry" . }}/postgres-ng:{{ .Values.imageTag }}"
         imagePullPolicy: "IfNotPresent"
         env:
+        - name: DATABASES
+          value: {{ .Values.databases | join " " | quote }}
         - name: DEBUG
           value: {{ .Values.debug | quote }}
         - name: PERSISTENCE_ENABLED