Merge branch 'gql' into crowd-sourced-data

asuc-octo · Dec 23, 2024 · 5df1d58 · 5df1d58
2 parents 5f7e51a + 85a9d97
commit 5df1d58
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/cd-dev.yaml b/.github/workflows/cd-dev.yaml
@@ -56,7 +56,7 @@ jobs:
           image:
             tag: "${{ needs.compute-sha.outputs.sha_short }}"
         host: ${{ needs.compute-sha.outputs.sha_short }}.dev.stanfurdtime.com
-        mongoUri: mongodb://bt-dev-mongo-mongodb.bt.svc.cluster.local:27017/bt
+        mongoUri: mongodb://bt-dev-mongo-mongodb-0.bt-dev-mongo-mongodb-headless.bt.svc.cluster.local:27017/bt
         redisUri: redis://bt-dev-redis-master.bt.svc.cluster.local:6379
     secrets: inherit
 

diff --git a/.github/workflows/cd-stage.yaml b/.github/workflows/cd-stage.yaml
@@ -34,4 +34,5 @@ jobs:
         host: staging.stanfurdtime.com
         mongoUri: mongodb://bt-stage-mongo-mongodb.bt.svc.cluster.local:27017/bt
         redisUri: redis://bt-stage-redis-master.bt.svc.cluster.local:6379
+    # TODO(core): change mongoUri to replicaset
     secrets: inherit
diff --git a/infra/app/values.yaml b/infra/app/values.yaml
@@ -4,7 +4,7 @@ ttl: 24 # in hours
 host: berkeleytime.com
 port: 80
 
-mongoUri: mongodb://bt-prod-mongo-mongodb.bt.svc.cluster.local:27017/bt
+mongoUri: mongodb://bt-prod-mongo-mongodb.bt.svc.cluster.local:27017/bt # TODO(core): change to replicaset
 redisUri: redis://bt-prod-redis-master.bt.svc.cluster.local:6379
 nodeEnv: production
 

diff --git a/infra/init.sh b/infra/init.sh
@@ -53,8 +53,7 @@ helm install bt-prod-app oci://registry-1.docker.io/octoberkeleytime/bt-app --na
 helm install bt-stage-mongo oci://registry-1.docker.io/octoberkeleytime/bt-mongo --namespace=bt \
     --version=1.0.0 \
     --set mongodb.commonLabels.env=stage \
-    --set hostPath=/data/stage/db \
-    --set mongodb.persistence.existingClaim=bt-stage-mongo-pvc
+    --set hostPath=/data/stage/db
 
 helm install bt-stage-redis oci://registry-1.docker.io/octoberkeleytime/bt-redis --namespace=bt \
     --version=1.0.0 \
@@ -68,6 +67,7 @@ helm install bt-stage-app oci://registry-1.docker.io/octoberkeleytime/bt-app --n
     --set host=staging.stanfurdtime.com \
     --set mongoUri=mongodb://bt-stage-mongo-mongodb.bt.svc.cluster.local:27017/bt \
     --set redisUri=redis://bt-stage-redis-master.bt.svc.cluster.local:6379 \
+# TODO(core): change mongoUri to replicaset
 
 # ==========
 # DEVELOPMENT
@@ -76,8 +76,7 @@ helm install bt-stage-app oci://registry-1.docker.io/octoberkeleytime/bt-app --n
 helm install bt-dev-mongo oci://registry-1.docker.io/octoberkeleytime/bt-mongo --namespace=bt \
     --version=1.0.0 \
     --set mongodb.commonLabels.env=dev \
-    --set hostPath=/data/dev/db \
-    --set mongodb.persistence.existingClaim=bt-dev-mongo-pvc
+    --set hostPath=/data/dev/db
 
 helm install bt-dev-redis oci://registry-1.docker.io/octoberkeleytime/bt-redis --namespace=bt \
     --version=1.0.0 \
@@ -90,6 +89,6 @@ helm install bt-dev-app oci://registry-1.docker.io/octoberkeleytime/bt-app --nam
     --set frontend.image.tag=dev1 \
     --set backend.image.tag=dev1 \
     --set host=dev1.stanfurdtime.com \
-    --set mongoUri=mongodb://bt-dev-mongo-mongodb.bt.svc.cluster.local:27017/bt \
+    --set mongoUri=mongodb://bt-dev-mongo-mongodb-0.bt-dev-mongo-mongodb-headless.bt.svc.cluster.local:27017/bt \
     --set redisUri=redis://bt-dev-redis-master.bt.svc.cluster.local:6379 \
     --set nodeEnv=development
diff --git a/infra/mongo/templates/pvc.yaml b/infra/mongo/templates/pvc.yaml
diff --git a/infra/mongo/values.yaml b/infra/mongo/values.yaml
@@ -17,10 +17,11 @@ mongodb:
     enabled: false
 
   persistence:
-    existingClaim: bt-prod-mongo-pvc
+    storageClass: manual
 
     # path in pod. should be same for all mongo pods.
     size: 10Gi
 
+  # required for persistence. without, data is not saved across pod restarts.
   volumePermissions:
     enabled: true