From e84773330a8839383b9d872e061eb7d52f66c9a5 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 13:48:25 -0800 Subject: [PATCH 1/5] fix: use postgres 16 containers for db --- base/codeinsights-db/codeinsights-db.Deployment.yaml | 2 +- base/codeintel-db/codeintel-db.Deployment.yaml | 2 +- base/pgsql/pgsql.Deployment.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/codeinsights-db/codeinsights-db.Deployment.yaml b/base/codeinsights-db/codeinsights-db.Deployment.yaml index 195f9ceda447..831e878a7a8d 100644 --- a/base/codeinsights-db/codeinsights-db.Deployment.yaml +++ b/base/codeinsights-db/codeinsights-db.Deployment.yaml @@ -42,7 +42,7 @@ spec: memory: "50Mi" containers: - name: codeinsights - image: index.docker.io/sourcegraph/codeinsights-db:5.9.1590@sha256:4e75b2c463ce1ef3bfeec4bb71a16693df02005e66b9e697859ce61064e08f42 + image: index.docker.io/sourcegraph/postgressql-16-codeinsights:insiders@sha256:4e75b2c463ce1ef3bfeec4bb71a16693df02005e66b9e697859ce61064e08f42 env: - name: POSTGRES_DB value: postgres diff --git a/base/codeintel-db/codeintel-db.Deployment.yaml b/base/codeintel-db/codeintel-db.Deployment.yaml index 49bc91b3962a..0ce3ae0f0b44 100644 --- a/base/codeintel-db/codeintel-db.Deployment.yaml +++ b/base/codeintel-db/codeintel-db.Deployment.yaml @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/codeintel-db:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 + image: index.docker.io/sourcegraph/postgres-16:insiders@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: diff --git a/base/pgsql/pgsql.Deployment.yaml b/base/pgsql/pgsql.Deployment.yaml index c1530aacc293..96c8d639c619 100644 --- a/base/pgsql/pgsql.Deployment.yaml +++ b/base/pgsql/pgsql.Deployment.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:5.9.1590@sha256:542e92925d9aa6d62f1f741e8422ef22f29a13b8cf96c2fce118af06eb882742 + image: index.docker.io/sourcegraph/alpine-3.14:insiders@sha256:542e92925d9aa6d62f1f741e8422ef22f29a13b8cf96c2fce118af06eb882742 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - env: - image: index.docker.io/sourcegraph/postgres-12-alpine:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 + image: index.docker.io/sourcegraph/postgres-16:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: From e90873f161e48471ac330dc1096d33f3acb522a8 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 13:57:09 -0800 Subject: [PATCH 2/5] remove sha256 --- base/codeinsights-db/codeinsights-db.Deployment.yaml | 2 +- base/codeintel-db/codeintel-db.Deployment.yaml | 2 +- base/pgsql/pgsql.Deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/codeinsights-db/codeinsights-db.Deployment.yaml b/base/codeinsights-db/codeinsights-db.Deployment.yaml index 831e878a7a8d..53e26a3c40eb 100644 --- a/base/codeinsights-db/codeinsights-db.Deployment.yaml +++ b/base/codeinsights-db/codeinsights-db.Deployment.yaml @@ -42,7 +42,7 @@ spec: memory: "50Mi" containers: - name: codeinsights - image: index.docker.io/sourcegraph/postgressql-16-codeinsights:insiders@sha256:4e75b2c463ce1ef3bfeec4bb71a16693df02005e66b9e697859ce61064e08f42 + image: index.docker.io/sourcegraph/postgressql-16-codeinsights:insiders env: - name: POSTGRES_DB value: postgres diff --git a/base/codeintel-db/codeintel-db.Deployment.yaml b/base/codeintel-db/codeintel-db.Deployment.yaml index 0ce3ae0f0b44..7f76c3fdcec3 100644 --- a/base/codeintel-db/codeintel-db.Deployment.yaml +++ b/base/codeintel-db/codeintel-db.Deployment.yaml @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/postgres-16:insiders@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 + image: index.docker.io/sourcegraph/postgres-16:insiders terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: diff --git a/base/pgsql/pgsql.Deployment.yaml b/base/pgsql/pgsql.Deployment.yaml index 96c8d639c619..4ceb5bf5c2bb 100644 --- a/base/pgsql/pgsql.Deployment.yaml +++ b/base/pgsql/pgsql.Deployment.yaml @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - env: - image: index.docker.io/sourcegraph/postgres-16:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8 + image: index.docker.io/sourcegraph/postgres-16:insiders terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: From d72efd97923ad2685924ff79a28e150aec24e495 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 14:02:58 -0800 Subject: [PATCH 3/5] fix name for new postgres images --- base/codeintel-db/codeintel-db.Deployment.yaml | 2 +- base/pgsql/pgsql.Deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/codeintel-db/codeintel-db.Deployment.yaml b/base/codeintel-db/codeintel-db.Deployment.yaml index 7f76c3fdcec3..840cdae51e39 100644 --- a/base/codeintel-db/codeintel-db.Deployment.yaml +++ b/base/codeintel-db/codeintel-db.Deployment.yaml @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - name: pgsql - image: index.docker.io/sourcegraph/postgres-16:insiders + image: index.docker.io/sourcegraph/postgresql-16:insiders terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: diff --git a/base/pgsql/pgsql.Deployment.yaml b/base/pgsql/pgsql.Deployment.yaml index 4ceb5bf5c2bb..266e48e3ef74 100644 --- a/base/pgsql/pgsql.Deployment.yaml +++ b/base/pgsql/pgsql.Deployment.yaml @@ -43,7 +43,7 @@ spec: memory: "50Mi" containers: - env: - image: index.docker.io/sourcegraph/postgres-16:insiders + image: index.docker.io/sourcegraph/postgresql-16:insiders terminationMessagePolicy: FallbackToLogsOnError readinessProbe: exec: From 3b539b9a34ebe7651bbb1b1cffd60962294fa52a Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 14:04:00 -0800 Subject: [PATCH 4/5] don't change sidecar --- base/pgsql/pgsql.Deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/pgsql/pgsql.Deployment.yaml b/base/pgsql/pgsql.Deployment.yaml index 266e48e3ef74..d0fa221593df 100644 --- a/base/pgsql/pgsql.Deployment.yaml +++ b/base/pgsql/pgsql.Deployment.yaml @@ -27,7 +27,7 @@ spec: spec: initContainers: - name: correct-data-dir-permissions - image: index.docker.io/sourcegraph/alpine-3.14:insiders@sha256:542e92925d9aa6d62f1f741e8422ef22f29a13b8cf96c2fce118af06eb882742 + image: index.docker.io/sourcegraph/alpine-3.14:5.9.1590@sha256:542e92925d9aa6d62f1f741e8422ef22f29a13b8cf96c2fce118af06eb882742 command: ["sh", "-c", "if [ -d /data/pgdata-12 ]; then chmod 750 /data/pgdata-12; fi"] volumeMounts: - mountPath: /data From 9bba91ea444b3c17acb6bb1b32bb86742fea1108 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 14:05:22 -0800 Subject: [PATCH 5/5] double S fix --- base/codeinsights-db/codeinsights-db.Deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/codeinsights-db/codeinsights-db.Deployment.yaml b/base/codeinsights-db/codeinsights-db.Deployment.yaml index 53e26a3c40eb..439d3f53af8f 100644 --- a/base/codeinsights-db/codeinsights-db.Deployment.yaml +++ b/base/codeinsights-db/codeinsights-db.Deployment.yaml @@ -42,7 +42,7 @@ spec: memory: "50Mi" containers: - name: codeinsights - image: index.docker.io/sourcegraph/postgressql-16-codeinsights:insiders + image: index.docker.io/sourcegraph/postgresql-16-codeinsights:insiders env: - name: POSTGRES_DB value: postgres