From 5ee0a9e59dbd3e22d49d0b702aa745cb95bd1779 Mon Sep 17 00:00:00 2001 From: Arvind Prabhakar Date: Wed, 24 Jun 2026 20:28:38 +0000 Subject: [PATCH] Moved platform databases to platform-postgres --- charts/forgejo/values.yaml | 2 +- charts/openproject/upstream-values.yaml | 5 +- charts/postgres/templates/service.yaml | 4 +- charts/postgres/templates/statefulset.yaml | 30 ++++++----- charts/postgres/values.yaml | 5 +- rendered/forgejo/forgejo.yaml | 2 +- .../openproject/upstream-openproject.yaml | 12 ++--- rendered/postgres/postgres.yaml | 50 ++++++++----------- 8 files changed, 57 insertions(+), 53 deletions(-) diff --git a/charts/forgejo/values.yaml b/charts/forgejo/values.yaml index 6ab72f6..2334bec 100644 --- a/charts/forgejo/values.yaml +++ b/charts/forgejo/values.yaml @@ -22,7 +22,7 @@ route: servicePort: 3000 database: - host: postgres.database.svc.cluster.local + host: platform-postgres.platform-services.svc.cluster.local port: 5432 name: forgejo user: forgejo diff --git a/charts/openproject/upstream-values.yaml b/charts/openproject/upstream-values.yaml index c04ceaa..72b629c 100644 --- a/charts/openproject/upstream-values.yaml +++ b/charts/openproject/upstream-values.yaml @@ -19,6 +19,9 @@ openproject: name: "IT Admin" mail: "it.admin@symcrest.com" +cron: + enabled: false + hocuspocus: enabled: false @@ -38,7 +41,7 @@ persistence: postgresql: bundled: false connection: - host: postgres.database.svc.cluster.local + host: platform-postgres.platform-services.svc.cluster.local port: 5432 auth: existingSecret: openproject-postgres-secret diff --git a/charts/postgres/templates/service.yaml b/charts/postgres/templates/service.yaml index e345a66..4e8ca27 100644 --- a/charts/postgres/templates/service.yaml +++ b/charts/postgres/templates/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: postgres + name: {{ .Values.name }} namespace: {{ .Values.namespace }} spec: type: ClusterIP selector: - app: postgres + app: {{ .Values.name }} ports: - name: postgres port: 5432 diff --git a/charts/postgres/templates/statefulset.yaml b/charts/postgres/templates/statefulset.yaml index 7eb797e..bbd218d 100644 --- a/charts/postgres/templates/statefulset.yaml +++ b/charts/postgres/templates/statefulset.yaml @@ -1,18 +1,18 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: postgres + name: {{ .Values.name }} namespace: {{ .Values.namespace }} spec: - serviceName: postgres + serviceName: {{ .Values.name }} replicas: 1 selector: matchLabels: - app: postgres + app: {{ .Values.name }} template: metadata: labels: - app: postgres + app: {{ .Values.name }} spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} @@ -22,22 +22,28 @@ spec: ports: - containerPort: 5432 name: postgres - envFrom: - - secretRef: - name: postgres-secret + env: + - name: POSTGRES_DB + value: {{ .Values.auth.database | quote }} + - name: POSTGRES_USER + value: {{ .Values.auth.username | quote }} + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.auth.secret }} + key: password + - name: PGDATA + value: /var/lib/postgresql/data/pgdata volumeMounts: - name: postgres-data mountPath: /var/lib/postgresql/data - env: - - name: PGDATA - value: /var/lib/postgresql/data/pgdata volumeClaimTemplates: - metadata: name: postgres-data spec: accessModes: - ReadWriteOnce - storageClassName: {{ .Values.storage.className | quote }} + storageClassName: {{ .Values.storage.className }} resources: requests: - storage: {{ .Values.storage.size | quote }} + storage: {{ .Values.storage.size }} diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml index b6f9b6d..fc7bf57 100644 --- a/charts/postgres/values.yaml +++ b/charts/postgres/values.yaml @@ -1,4 +1,5 @@ -namespace: database +name: platform-postgres +namespace: platform-services image: repository: postgres @@ -7,7 +8,7 @@ image: auth: database: postgres username: postgres - secret: postgres-secret + secret: platform-postgres-secret storage: className: longhorn diff --git a/rendered/forgejo/forgejo.yaml b/rendered/forgejo/forgejo.yaml index ec965fd..e32ff1f 100644 --- a/rendered/forgejo/forgejo.yaml +++ b/rendered/forgejo/forgejo.yaml @@ -65,7 +65,7 @@ spec: - name: FORGEJO__database__DB_TYPE value: "postgres" - name: FORGEJO__database__HOST - value: "postgres.database.svc.cluster.local:5432" + value: "platform-postgres.platform-services.svc.cluster.local:5432" - name: FORGEJO__database__NAME value: "forgejo" - name: FORGEJO__database__USER diff --git a/rendered/openproject/upstream-openproject.yaml b/rendered/openproject/upstream-openproject.yaml index 2f65253..fc3ac17 100644 --- a/rendered/openproject/upstream-openproject.yaml +++ b/rendered/openproject/upstream-openproject.yaml @@ -72,9 +72,9 @@ metadata: app.kubernetes.io/component: openproject data: # reset data to make sure only keys defined below remain stringData: - DATABASE_HOST: "postgres.database.svc.cluster.local" + DATABASE_HOST: "platform-postgres.platform-services.svc.cluster.local" DATABASE_PORT: "5432" - DATABASE_URL: "postgresql://openproject@postgres.database.svc.cluster.local:5432/openproject" + DATABASE_URL: "postgresql://openproject@platform-postgres.platform-services.svc.cluster.local:5432/openproject" OPENPROJECT_SEED_ADMIN_USER_PASSWORD: "TempPass123" OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET: "true" OPENPROJECT_SEED_ADMIN_USER_NAME: "IT Admin" @@ -124,7 +124,7 @@ metadata: "helm.sh/resource-policy": "keep" data: # reset data to make sure only keys defined below remain stringData: - secret-key-base: dNM2C8uej7qGsjJHjKMRAxncbVREhzBOysrk7iVCVr6MHEibFCgDwbRSqB8Qe9WK + secret-key-base: SDuOoKzOjz5WqKN1MUWy3hmnXAr7xWyP8aRRiSp2CdYbKXVL2cpNPgbk8pQSWkdu ... --- # Source: openproject/templates/persistentvolumeclaim.yaml @@ -331,7 +331,7 @@ spec: # annotate pods with env value checksums so changes trigger re-deployments - checksum/env-core: d595adde5a7e1007834c68766ac51f7652c1246a63b976431b0ee5a6c9870a78 + checksum/env-core: 9168cde503dc9ab26d56a3d92b2f12e3634fcc94d89a489f1fe35418b66c6357 checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b @@ -546,7 +546,7 @@ spec: # annotate pods with env value checksums so changes trigger re-deployments - checksum/env-core: d595adde5a7e1007834c68766ac51f7652c1246a63b976431b0ee5a6c9870a78 + checksum/env-core: 9168cde503dc9ab26d56a3d92b2f12e3634fcc94d89a489f1fe35418b66c6357 checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b @@ -797,7 +797,7 @@ spec: # annotate pods with env value checksums so changes trigger re-deployments - checksum/env-core: d595adde5a7e1007834c68766ac51f7652c1246a63b976431b0ee5a6c9870a78 + checksum/env-core: 9168cde503dc9ab26d56a3d92b2f12e3634fcc94d89a489f1fe35418b66c6357 checksum/env-memcached: fd1a022eb3ba9e1437809d0177660fdab3ae79b4fcfbee2f8ec1264ee0aa944d checksum/env-oidc: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/env-s3: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b diff --git a/rendered/postgres/postgres.yaml b/rendered/postgres/postgres.yaml index 7456ec3..9352fb8 100644 --- a/rendered/postgres/postgres.yaml +++ b/rendered/postgres/postgres.yaml @@ -1,26 +1,14 @@ --- -# Source: postgres/templates/secret.yaml -apiVersion: v1 -kind: Secret -metadata: - name: postgres-secret - namespace: database -type: Opaque -stringData: - POSTGRES_DB: "symcrest" - POSTGRES_USER: "admin" - POSTGRES_PASSWORD: "TempPass123" ---- # Source: postgres/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: postgres - namespace: database + name: platform-postgres + namespace: platform-services spec: type: ClusterIP selector: - app: postgres + app: platform-postgres ports: - name: postgres port: 5432 @@ -30,18 +18,18 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - name: postgres - namespace: database + name: platform-postgres + namespace: platform-services spec: - serviceName: postgres + serviceName: platform-postgres replicas: 1 selector: matchLabels: - app: postgres + app: platform-postgres template: metadata: labels: - app: postgres + app: platform-postgres spec: nodeSelector: workload: app @@ -51,22 +39,28 @@ spec: ports: - containerPort: 5432 name: postgres - envFrom: - - secretRef: - name: postgres-secret + env: + - name: POSTGRES_DB + value: "postgres" + - name: POSTGRES_USER + value: "postgres" + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: platform-postgres-secret + key: password + - name: PGDATA + value: /var/lib/postgresql/data/pgdata volumeMounts: - name: postgres-data mountPath: /var/lib/postgresql/data - env: - - name: PGDATA - value: /var/lib/postgresql/data/pgdata volumeClaimTemplates: - metadata: name: postgres-data spec: accessModes: - ReadWriteOnce - storageClassName: "longhorn" + storageClassName: longhorn resources: requests: - storage: "20Gi" + storage: 20Gi