From 83ccfcb675855f385c46b44bae9fa69002198f3f Mon Sep 17 00:00:00 2001 From: I515719 Date: Thu, 23 Apr 2026 16:08:28 +0800 Subject: [PATCH 1/3] fix migrate db job pending issue --- .gitignore | 1 + deploy/infrabox/templates/db/job.yaml | 3 +++ src/db/migrate.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 38b1a1e0..ff2ba51d 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ src/services/namespace/vendor src/services/namespace/namespace src/services/namespace/tmp/_output/ CLAUDE.md +ci diff --git a/deploy/infrabox/templates/db/job.yaml b/deploy/infrabox/templates/db/job.yaml index 9d7c6c7f..6cda8fb9 100644 --- a/deploy/infrabox/templates/db/job.yaml +++ b/deploy/infrabox/templates/db/job.yaml @@ -25,11 +25,14 @@ spec: name: infrabox-db-migration spec: {{ include "imagePullSecret" . | indent 8 }} + shareProcessNamespace: true containers: {{ include "containers_database" . | indent 12 }} - name: migrate image: {{ include "image_repository" . }}/db:{{ include "image_tag" . }} + command: ["/bin/sh", "-c"] + args: ["python db/migrate.py; kill -2 $(pgrep cloud_sql_proxy)"] env: {{ include "env_database" . | indent 16 }} {{ include "env_general" . | indent 16 }} diff --git a/src/db/migrate.py b/src/db/migrate.py index 1dc195f7..52981447 100644 --- a/src/db/migrate.py +++ b/src/db/migrate.py @@ -129,7 +129,7 @@ def main(): conn = connect_db() migrate_db(conn) - # configure_admin(conn) + configure_admin(conn) conn.close() if __name__ == "__main__": From db71a61b9d4808df90b539edd4c2c1b980a9b908 Mon Sep 17 00:00:00 2001 From: I515719 Date: Thu, 23 Apr 2026 17:01:08 +0800 Subject: [PATCH 2/3] fix(migrate): kill cloudsql-proxy after migrate completes using python --- deploy/infrabox/templates/db/job.yaml | 2 +- src/db/migrate.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/infrabox/templates/db/job.yaml b/deploy/infrabox/templates/db/job.yaml index 6cda8fb9..f1d22412 100644 --- a/deploy/infrabox/templates/db/job.yaml +++ b/deploy/infrabox/templates/db/job.yaml @@ -32,7 +32,7 @@ spec: name: migrate image: {{ include "image_repository" . }}/db:{{ include "image_tag" . }} command: ["/bin/sh", "-c"] - args: ["python db/migrate.py; kill -2 $(pgrep cloud_sql_proxy)"] + args: ["python db/migrate.py; python -c \"import os,signal\nfor p in os.listdir('/proc'):\n if not p.isdigit(): continue\n try:\n cmdline=open('/proc/'+p+'/cmdline','rb').read()\n if b'cloud_sql_proxy' in cmdline: os.kill(int(p),signal.SIGTERM)\n except: pass\""] env: {{ include "env_database" . | indent 16 }} {{ include "env_general" . | indent 16 }} diff --git a/src/db/migrate.py b/src/db/migrate.py index 52981447..76845a07 100644 --- a/src/db/migrate.py +++ b/src/db/migrate.py @@ -116,6 +116,7 @@ def configure_admin(conn): ''', [email, hashed_password, email, hashed_password]) cur.close() conn.commit() + logger.info("Finished updating admin credentials") def main(): get_env('INFRABOX_VERSION') From 60c65373db47645e4c78394fed19366d3d29c986 Mon Sep 17 00:00:00 2001 From: I515719 Date: Thu, 23 Apr 2026 17:29:29 +0800 Subject: [PATCH 3/3] fix(migrate): add sleep for debugging cloudsql-proxy kill --- deploy/infrabox/templates/db/job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/infrabox/templates/db/job.yaml b/deploy/infrabox/templates/db/job.yaml index f1d22412..ee05e410 100644 --- a/deploy/infrabox/templates/db/job.yaml +++ b/deploy/infrabox/templates/db/job.yaml @@ -32,7 +32,7 @@ spec: name: migrate image: {{ include "image_repository" . }}/db:{{ include "image_tag" . }} command: ["/bin/sh", "-c"] - args: ["python db/migrate.py; python -c \"import os,signal\nfor p in os.listdir('/proc'):\n if not p.isdigit(): continue\n try:\n cmdline=open('/proc/'+p+'/cmdline','rb').read()\n if b'cloud_sql_proxy' in cmdline: os.kill(int(p),signal.SIGTERM)\n except: pass\""] + args: ["python db/migrate.py; sleep 3600"] env: {{ include "env_database" . | indent 16 }} {{ include "env_general" . | indent 16 }}