do image push to 2 artifacts

bcnmy · Jan 26, 2024 · 939d0c4 · 939d0c4
1 parent aa00081
commit 939d0c4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 37 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -45,6 +45,7 @@ jobs:
       matrix:
         image:
           - us-docker.pkg.dev/biconomy-prod/bundler/trustwallet
+          - us-docker.pkg.dev/prj-biconomy-prod-001/bundler/bundler
           # LOCATION-docker.pkg.dev/PROJECT-ID/REPOSITORY/IMAGE
           # {owner}/{repo}/.github/workflows/{filename}@{ref}
     uses: bcnmy/devops/.github/workflows/container_img_build_push_gar.yaml@master

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -92,32 +92,33 @@ jobs:
       deploy_command: './install-bundler/bundler-update-release.sh bundler-tw-staging.cfg ${GITHUB_REF:10}'
       # deploy_command: 'echo IMG_VERSION is ${GITHUB_REF:10}' # for example extracts v0.0.5 from "refs/tags/v0.0.5"  
 
-#   deploy_tw_prod:
-#     needs: [deploy_tw_staging]
-#     # environment: tw-prod
-#     # Allow the job to fetch a GitHub ID token
-#     # runs-on: ubuntu-latest
-#     permissions:
-#       id-token: write
-#       contents: read
-#     uses: bcnmy/devops/.github/workflows/deploy_to_gke.yaml@master
-#     with:
-#       environment: 'tw-prod'
-#       # GCP project where the identity provider is
-#       # gcloud projects describe prj-workload-identity-001
-#       gcp_project_number: '766873424314'
-#       gcp_project_id: 'biconomy-prod'
-#       gcp_bastion: 'bastion02'
-#       gcp_bastion_zone: 'us-east1-b'
-#       gcp_pool_id: 'pool-id-github-actions'
-#       # created by devops/gcp/github-actions/configure_workload_identity_federation_with_github_actions_pipelines.sh
-#       # gcp_provider_id: 'ga-GITHUB_REPO_NAME'
-#       gcp_provider_id: 'ga-bundler'
-#       # SERVICE_ACCOUNT_EMAIL="${SERVICE_ACCOUNT}@${PROJECT}.iam.gserviceaccount.com"
-#       gcp_service_account: '[email protected]'
-#       gcp_cluster_name: 'trustwallet'
-#       gcp_cluster_location: 'us-central1'
-#       use_internal_ip: true
-#       deploy_command: './install-paymaster/paymaster-update-setup.sh bundler-tw-production.cfg ${GITHUB_REF:10}'
-#       # deploy_command: './install-paymaster/paymaster-update-setup.sh $bundler-tw-production.cfg {GITHUB_REF:10}'
-#       # deploy_command: 'helm ls --all-namespaces'
+      # TODO: update bundler prod image to include gcp project
+  deploy_tw_prod:
+    needs: [deploy_tw_staging]
+    # environment: tw-prod
+    # Allow the job to fetch a GitHub ID token
+    # runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    uses: bcnmy/devops/.github/workflows/deploy_to_gke.yaml@master
+    with:
+      environment: 'tw-prod'
+      # GCP project where the identity provider is
+      # gcloud projects describe prj-workload-identity-001
+      gcp_project_number: '766873424314'
+      # GCP project ID where the workload will be deployed
+      gcp_project_id: 'prj-biconomy-prod-001'
+      gcp_bastion: 'bastion02'
+      gcp_bastion_zone: 'us-east1-b'
+      gcp_pool_id: 'pool-id-github-actions'
+      # created by devops/gcp/github-actions/configure_workload_identity_federation_with_github_actions_pipelines.sh
+      # gcp_provider_id: 'ga-GITHUB_REPO_NAME'
+      gcp_provider_id: 'ga-bundler'
+      # SERVICE_ACCOUNT_EMAIL="${SERVICE_ACCOUNT}@${PROJECT}.iam.gserviceaccount.com"
+      gcp_service_account: '[email protected]'
+      gcp_cluster_name: 'trustwallet'
+      gcp_cluster_location: 'us-central1'
+      use_internal_ip: true
+      # deploy_command: './install-bundler/bundler-update-release.sh bundler-tw-production.cfg ${GITHUB_REF:10}'
+      deploy_command: 'helm ls --all-namespaces'
diff --git a/install-bundler/configs/bundler-tw-production.cfg b/install-bundler/configs/bundler-tw-production.cfg
@@ -1,8 +1,8 @@
-NAMESPACE="bundler-tw-staging"
-PROJECT_ID="biconomy-prod"
-IMAGE="us-docker.pkg.dev/biconomy-prod/bundler/trustwallet"
-IMAGE_TAG=8d544d0
-DNS_NAME="bundler-tw-staging.biconomy.io"
-IP_NAME="bundler-tw-staging"
-CHAINS_CFG_FILENAME="staging-trust-wallet-chains.sh"
-CONTEXT="gke_biconomy-prod_us-east1_dedicated-bundler"
+NAMESPACE="trustwallet"
+PROJECT_ID="prj-biconomy-prod-001"
+IMAGE="us-docker.pkg.dev/prj-biconomy-prod-001/bundler/bundler"
+IMAGE_TAG=bundler:1.5
+DNS_NAME="tw-bundler.biconomy.io"
+IP_NAME="trustwallet"
+CHAINS_CFG_FILENAME="prod-trust-wallet-chains.sh"
+CONTEXT="gke_prj-biconomy-prod-001_us-central1_trustwallet"