chore: adding pg for voucher (#6557)

GaloyMoney · May 23, 2024 · 6c9618d · 6c9618d
1 parent 4139132
commit 6c9618d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 5 deletions.
diff --git a/charts/voucher/Chart.lock b/charts/voucher/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: postgresql
+  repository: https://charts.bitnami.com/bitnami
+  version: 11.9.6
+digest: sha256:e9f252a13edc2a9ecde83ea222591e1767aa08f97fb7c9071d69c49bff78a481
+generated: "2024-05-22T17:49:55.172043+05:30"
diff --git a/charts/voucher/Chart.yaml b/charts/voucher/Chart.yaml
@@ -18,3 +18,8 @@ version: 0.1.0-dev
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 appVersion: 0.1.0
+dependencies:
+  - name: postgresql
+    version: 11.9.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: postgresql.enabled
diff --git a/charts/voucher/values.yaml b/charts/voucher/values.yaml
@@ -20,4 +20,11 @@ ingress:
 service:
   port: 3000
   type: ClusterIP
+postgresql:
+  enabled: true
+  auth:
+    enablePostgresUser: false
+    username: voucher
+    password: voucher
+    database: voucher
 resources: {}
diff --git a/ci/testflight/voucher/main.tf b/ci/testflight/voucher/main.tf
@@ -26,6 +26,11 @@ resource "kubernetes_secret" "smoketest" {
   }
 }
 
+resource "random_password" "postgresql" {
+  length  = 20
+  special = false
+}
+
 resource "kubernetes_secret" "voucher" {
   metadata {
     name      = "voucher"
@@ -36,7 +41,8 @@ resource "kubernetes_secret" "voucher" {
     "next-auth-secret" : "dummy123"
     "client-secret" : "dummy"
     "escrow-api-key" : "dummy"
-    "pg-con" : "dummy"
+    pg-user-pw : random_password.postgresql.result
+    pg-con : "postgres://voucher:${random_password.postgresql.result}@voucher-postgresql:5432/voucher"
   }
 }
 

diff --git a/ci/testflight/voucher/testflight-values.yml b/ci/testflight/voucher/testflight-values.yml
@@ -6,3 +6,9 @@ voucher:
   coreUrl: "http://galoy-oathkeeper-proxy.galoy-staging-galoy.svc.cluster.local:4455/graphql"
   voucherUrl: "http://localhost:3000"
   nextAuthUrl: "http://voucher:3000"
+
+postgresql:
+  auth:
+    existingSecret: voucher
+    secretKeys:
+      userPasswordKey: "pg-user-pw"
diff --git a/dev/addons/Tiltfile b/dev/addons/Tiltfile
@@ -2,6 +2,7 @@ load('ext://helm_resource', 'helm_resource')
 load('ext://namespace', 'namespace_create')
 load('ext://secret', 'secret_from_dict')
 load('../common/Tiltfile', 'copy_secret')
+load('../common/Tiltfile', 'helm_release')
 
 name_prefix = 'galoy-dev'
 galoy_namespace = '{}-galoy'.format(name_prefix)
@@ -139,15 +140,17 @@ k8s_yaml(secret_from_dict(
     "next-auth-secret" : "dummy",
     "client-secret" : "dummy",
     "escrow-api-key" : "dummy",
-    "pg-con" : "dummy"
+    "pg-con" : 'postgres://voucher:voucher@voucher-postgresql:5432/voucher'
   }
 ))
 
-k8s_yaml(helm(
+helm_release(
   '../../charts/voucher',
   name = 'voucher',
   namespace = addons_namespace,
-  values = ['./voucher-values.yml']
-))
+  values = ['./voucher-values.yml'],
+  dependency_build=True,
+  add_repos=True
+)
 
 k8s_resource(workload='voucher', labels='addons')
diff --git a/dev/addons/voucher-values.yml b/dev/addons/voucher-values.yml
@@ -1,2 +1,7 @@
 secrets:
   create: false
+
+postgresql:
+  primary:
+    persistence:
+      enabled: false