From 6ad0032eb3be8547b2f2a89bd384e81f292aed74 Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Wed, 1 Mar 2023 13:54:27 -0500 Subject: [PATCH 1/2] fix: temp --- .github/workflows/canary-eu-central-1.yml | 6 +++--- .github/workflows/production-ca-central-1.yml | 1 + .github/workflows/production-eu-central-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 1 + .../tasks/canary/eu-central-1/canary-eu-central-1.yml | 6 +++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/canary-eu-central-1.yml b/.github/workflows/canary-eu-central-1.yml index d4e46543..75c780b6 100644 --- 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/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index f9b72956..4c043640 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -92,6 +92,7 @@ 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/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index a5bd20e7..22402b55 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -98,4 +98,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 \ No newline at end of file diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index bac71040..41e6a2c6 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -92,6 +92,7 @@ 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: 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 index 528adf81..6e50882f 100644 --- 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 From 430fc8a0c376ce378c11788d8bf76452b9bef7cd Mon Sep 17 00:00:00 2001 From: Roniel Valdez Date: Wed, 1 Mar 2023 13:57:18 -0500 Subject: [PATCH 2/2] chore: fix infra deployment files spacing issues --- .github/workflows/production-ca-central-1.yml | 1 - .github/workflows/production-eu-central-1.yml | 2 +- .github/workflows/production-eu-south-1.yml | 1 - .../tasks/production/ca-central-1/production-ca-central-1.yml | 1 - .../tasks/production/eu-central-1/production-eu-central-1.yml | 2 +- .../tasks/production/eu-south-1/production-eu-south-1.yml | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/production-ca-central-1.yml b/.github/workflows/production-ca-central-1.yml index 4c043640..f9b72956 100644 --- a/.github/workflows/production-ca-central-1.yml +++ b/.github/workflows/production-ca-central-1.yml @@ -92,7 +92,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/.github/workflows/production-eu-central-1.yml b/.github/workflows/production-eu-central-1.yml index 22402b55..a5bd20e7 100644 --- a/.github/workflows/production-eu-central-1.yml +++ b/.github/workflows/production-eu-central-1.yml @@ -98,4 +98,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 \ No newline at end of file + wait-for-service-stability: true diff --git a/.github/workflows/production-eu-south-1.yml b/.github/workflows/production-eu-south-1.yml index 41e6a2c6..bac71040 100644 --- a/.github/workflows/production-eu-south-1.yml +++ b/.github/workflows/production-eu-south-1.yml @@ -92,7 +92,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: 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 index cd477d14..14fd5c69 100644 --- 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 index 61f75bc1..416d5f82 100644 --- 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 \ No newline at end of file + 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 index 22deb437..52b5aa2c 100644 --- 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: