Run postgres in cluster

aserto-dev · Nov 22, 2024 · fb60c2d · fb60c2d
1 parent 98866e6
commit fb60c2d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,19 +41,8 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:16
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd "pg_isready -U $POSTGRES_USER"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
+    env:
+      POSTGRES_PASSWORD: postgres
     steps:
       -
         name: Read Configuration
@@ -90,11 +79,15 @@ jobs:
             --agents 1
             --k3s-arg "--disable=metrics-server@server:*"
       -
-        name: Cluster CoreDNS
+        name: Deploy Postgres
         run: |
-          kubectl -n kube-system get configmap coredns -o yaml
-          ip address
-          nslookup postgres
+          helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \
+            --namespace postgres --create-namespace \
+            --set auth.postgresPassword=${{ env.POSTGRES_PASSWORD }}
+
+          echo "Waiting for postgres to be ready"
+          kubectl wait pods --selector app.kubernetes.io/name=postgresql \
+            --for condition=Ready --namespace postgres --timeout=60s
       -
         name: Generate admin ssh key
         id: sshkey
@@ -106,8 +99,6 @@ jobs:
         name: Test Directory
         env:
           GITHUB_TOKEN: ${{ env.READ_WRITE_TOKEN }}
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
           SSH_PUBLIC_KEY: ${{ steps.sshkey.outputs.public_key }}
           SSH_PRIVATE_KEY: ${{ steps.sshkey.outputs.private_key }}
         run: |

diff --git a/test/directory/directory.values.yaml b/test/directory/directory.values.yaml
@@ -7,7 +7,7 @@ imagePullSecrets:
 
 rootDirectory:
   database:
-    host: host.k3d.internal
+    host: postgresql.postgres.svc.cluster.local
     dbName: test-root-ds
     sslMode: disable
     admin:
@@ -17,7 +17,7 @@ rootDirectory:
 
 tenantDirectory:
   database:
-    host: host.k3d.internal
+    host: postgresql.postgres.svc.cluster.local
     dbName: test-ds
     sslMode: disable
     admin: