Merge pull request #1048 from pokt-foundation/change-euc-canary-config

Change eu-central-1 canary config
pokt-foundation · Mar 1, 2023 · 953601e · 953601e
2 parents 1cee5d9 + 430fc8a
commit 953601e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/canary-eu-central-1.yml b/.github/workflows/canary-eu-central-1.yml
@@ -1,10 +1,10 @@
 # .github/workflows: DO NOT MODIFY HERE BUT RATHER REFER TO THEIR CORRESPONDING
 # TEMPLATE IN THE POCKET-GATEWWAY FOLDER OTHERWISE YOUR CHANGES WILL BE OVERWRITTEN
-name: Terraform canary Deployment eu-central-1
+name: Terraform canary (Currently production) Deployment eu-central-1
 
 on:
   push:
-    branches: [canary]
+    branches: [master]
 
 jobs:
   deploy:
@@ -70,7 +70,7 @@ jobs:
           envkey_GATEWAY_HOST: ${{ secrets.GATEWAY_HOST }}
           envkey_REMOTE_REDIS_ENDPOINT: gateway-canary-redis.6iq570.clustercfg.euc1.cache.amazonaws.com
           envkey_REGION: 'eu-central-1'
-          envkey_REGION_NAME: '/canary/eu-central-1'
+          envkey_REGION_NAME: 'eu-central-1'
           file_name: .env
 
       - name: Build, tag, and push image to Amazon ECR

diff --git a/pocket-gateway/tasks/canary/eu-central-1/canary-eu-central-1.yml b/pocket-gateway/tasks/canary/eu-central-1/canary-eu-central-1.yml
@@ -2,11 +2,11 @@
 # TEMPLATE IN THE POCKET-GATEWWAY FOLDER OTHERWISE YOUR CHANGES WILL BE OVERWRITTEN
 {{! Template used to generate workflow file with shared-enviroments }}
 {{=[[ ]]=}}
-name: Terraform canary Deployment eu-central-1
+name: Terraform canary (Currently production) Deployment eu-central-1
 
 on:
   push:
-    branches: [canary]
+    branches: [master]
 
 jobs:
   deploy:
@@ -36,7 +36,7 @@ jobs:
           [[/shared_envs]]
           envkey_REMOTE_REDIS_ENDPOINT: gateway-canary-redis.6iq570.clustercfg.euc1.cache.amazonaws.com
           envkey_REGION: 'eu-central-1'
-          envkey_REGION_NAME: '/canary/eu-central-1'
+          envkey_REGION_NAME: 'eu-central-1'
           file_name: .env
 
       - name: Build, tag, and push image to Amazon ECR

diff --git a/pocket-gateway/tasks/production/ca-central-1/production-ca-central-1.yml b/pocket-gateway/tasks/production/ca-central-1/production-ca-central-1.yml
@@ -58,7 +58,6 @@ jobs:
           container-name: gateway
           image: ${{ steps.build-image.outputs.image }}
 
-
       - name: Deploy / ca-central-1
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with:

diff --git a/pocket-gateway/tasks/production/eu-central-1/production-eu-central-1.yml b/pocket-gateway/tasks/production/eu-central-1/production-eu-central-1.yml
@@ -64,4 +64,4 @@ jobs:
           task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }}
           service: gateway-prod
           cluster: gateway-prod
-          wait-for-service-stability: true
+          wait-for-service-stability: true
diff --git a/pocket-gateway/tasks/production/eu-south-1/production-eu-south-1.yml b/pocket-gateway/tasks/production/eu-south-1/production-eu-south-1.yml
@@ -58,7 +58,6 @@ jobs:
           container-name: gateway
           image: ${{ steps.build-image.outputs.image }}
 
-
       - name: Deploy / eu-south-1
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with: