Merge branch 'main' into deploy/first-test

dappforce · Dec 7, 2023 · 548bc45 · 548bc45
2 parents 6b6de9a + 7043ee9
commit 548bc45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
@@ -86,12 +86,12 @@ jobs:
         run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 ${{ secrets.K8S_PROD }}
 
       - name: Update docker image name
-        run: TAG=${{ env.name }}-$(echo $GITHUB_SHA | head -c7) && sed -i 's|<IMAGE>|dappforce/subsocial-aggregation:'${TAG}'|' $GITHUB_WORKSPACE/deployment/prod/core/deploy.yaml
+        run: TAG=${{ env.name }}-$(echo $GITHUB_SHA | head -c7) && sed -i 's|<IMAGE>|dappforce/subsocial-aggregation:'${TAG}'|' $GITHUB_WORKSPACE/deployment/prod/deploy.yaml
 
       - name: Deploy to DigitalOcean Kubernetes
         run: |
-            kubectl apply -f $GITHUB_WORKSPACE/deployment/prod/core/all.yaml
-            kubectl apply -f $GITHUB_WORKSPACE/deployment/prod/core/deploy.yaml
+            kubectl apply -f $GITHUB_WORKSPACE/deployment/prod/all.yaml
+            kubectl apply -f $GITHUB_WORKSPACE/deployment/prod/deploy.yaml
 
       - name: Verify deployment
         run: kubectl -n sub-id rollout status deployment/aggregation
diff --git a/deployment/prod/all.yaml b/deployment/prod/all.yaml
@@ -31,7 +31,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: aggregation.subsocial.network
+    - host: tx-aggregation.subsocial.network
       http:
         paths:
           - backend:
@@ -44,17 +44,17 @@ spec:
 
   tls:
     - hosts:
-        - aggregation.subsocial.network
-      secretName: subsocial-ssl
+        - tx-aggregation.subsocial.network
+      secretName: subsocial-ssl2
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: aggregationenv
+  name: aggregation-env
   namespace: sub-id
 data:
-  AGGREGATOR_DB_DATABASE: 'aggregator_pool'
+  AGGREGATOR_DB_DATABASE: 'aggregation_pool'
   AGGREGATOR_REDIS_HOST: 'redis-aggregation-master.default'
   AGGREGATOR_REDIS_PREFIX: 'aggregator_queue'
   AGGREGATOR_REDIS_PORT: '6379'