Fixes to dev env / db restorer from updating CloudSQL proxy setup to …

…match latest Google documentation
wcjordan · May 4, 2024 · 75631b1 · 75631b1
1 parent ad7094e
commit 75631b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/helm/templates/db-config.yaml b/helm/templates/db-config.yaml
@@ -47,6 +47,7 @@ spec:
       - name: cloud-sql-proxy
         image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:latest
         args:
+        - "--exit-zero-on-sigterm"
         - "--structured-logs"
         - "--port=5432"
         - {{ printf "%s:us-east4:%s" .Values.gcpProject (include "..dbInstanceName" .) | quote }}

diff --git a/misc_containers/db_restorer/entrypoint.sh b/misc_containers/db_restorer/entrypoint.sh
@@ -35,5 +35,5 @@ else
     psql < ./backup_to_restore.sql
 fi
 
-# Kill cloud_sql_proxy so the job will complete
-kill -INT $(pgrep cloud_sql_proxy)
+# Kill cloud-sql-proxy so the job will complete
+kill -SIGTERM -INT $(pgrep cloud-sql-proxy)