From 6e9f7359bef1b66a31219c85baf7f0020b3ea4c0 Mon Sep 17 00:00:00 2001 From: Sofia Giovacchini Date: Mon, 3 Mar 2025 11:48:09 +0100 Subject: [PATCH] Remove dev env and add new sbx deployment --- .github/workflows/deploy_nonProd.yml | 42 +++++-------------------- .github/workflows/reboot.yml | 4 +++ CHANGELOG.md | 3 ++ Makefile | 46 ++++++++-------------------- 4 files changed, 26 insertions(+), 69 deletions(-) diff --git a/.github/workflows/deploy_nonProd.yml b/.github/workflows/deploy_nonProd.yml index f08f8f4f..27d9bec1 100644 --- a/.github/workflows/deploy_nonProd.yml +++ b/.github/workflows/deploy_nonProd.yml @@ -10,10 +10,9 @@ on: env: required: true description: 'Please select env you want to deploy the version' - default: dev + default: sbx type: choice options: - - dev - sbx jobs: build_local: @@ -65,12 +64,6 @@ jobs: export IMAGE="$ECR_REGISTRY/sanctuary" echo "image=$IMAGE" >> $GITHUB_OUTPUT - - name: Build and push to develop - if: inputs.env == 'dev' - run: | - docker build -t ${{ steps.docker-params.outputs.image }}:develop . - docker push ${{ steps.docker-params.outputs.image }}:develop - - name: Build and push to sbx if: inputs.env == 'sbx' run: | @@ -104,32 +97,11 @@ jobs: - name: Restart deployments to take last Image run: | - if [ "${{ inputs.env }}" == "dev" ]; then - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-api-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-api-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-foreign-chain-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-foreign-chain-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-metrics-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-metrics-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-resolver-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-resolver-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-sync-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-sync-worker-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-scheduler-bsc01 -n dev - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-scheduler-bsc01 -n dev - fi - if [ "${{ inputs.env }}" == "sbx" ]; then - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-api-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-api-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-metrics-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-metrics-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-resolver-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-resolver-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-sync-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-sync-worker-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-scheduler-bsc01 -n sandbox - kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-scheduler-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-api-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-metrics-worker-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-resolver-worker-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-sync-worker-bsc01 -n sandbox + kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-scheduler-bsc01 -n sandbox fi diff --git a/.github/workflows/reboot.yml b/.github/workflows/reboot.yml index 73df8524..63f91f70 100644 --- a/.github/workflows/reboot.yml +++ b/.github/workflows/reboot.yml @@ -36,6 +36,10 @@ jobs: kubectl rollout restart deployment/sanctuary-scheduler-bsc01 echo "Restarting 'sanctuary sync worker'" kubectl rollout restart deployment/sanctuary-sync-worker-bsc01 + echo "Restarting 'sanctuary metrics worker'" + kubectl rollout restart deployment/sanctuary-metrics-worker-bsc01 + echo "Restarting 'sanctuary api" + kubectl rollout restart deployment/sanctuary-api-bsc01 notify: name: Discord Notification diff --git a/CHANGELOG.md b/CHANGELOG.md index b68bdee5..624118f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased +### Updated +- Update Makefile and github actions due to decommission of DEV environment + ### Added - GitHub Action to deploy to nonprod ### Fixed diff --git a/Makefile b/Makefile index 73024c01..adfe58cd 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ include .env TAG=`git rev-parse --short HEAD` -DEVELOP="$(AWS_REPOSITORY)/sanctuary:develop" +IMAGE="sanctuary" CRED_TMP := /tmp/.credentials.tmp DURATION := 900 AWS_REGION := eu-central-1 ECR_AWS_REGION := us-east-2 -default: dev +default: assume update-stg-kubeconfig assume: @aws sts assume-role --profile umb-master \ @@ -27,9 +27,9 @@ update-stg-kubeconfig: @aws --profile umb-staging configure set aws_session_token $$(cat ${CRED_TMP} | jq -r '.SessionToken' ) @aws --profile umb-staging --region $(AWS_REGION) eks update-kubeconfig --kubeconfig ~/.kube/config-staging --name umb_staging -build-dev: - @echo "## Building the docker image for dev ##" - docker buildx build --push --platform linux/amd64 -t $(DEVELOP) . +build: + @echo "## Building the docker image ##" + @docker build -t $(IMAGE) . build-sbx: @echo "## Building the docker image for sbx ##" @@ -38,34 +38,12 @@ build-sbx: login: @aws ecr --profile umb-central --region $(ECR_AWS_REGION) get-login-password | docker login --username AWS --password-stdin $(AWS_REPOSITORY) -publish-bsc: - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-api-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-api-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-foreign-chain-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-foreign-chain-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-metrics-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-metrics-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-resolver-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-resolver-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-sync-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-sync-worker-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-scheduler-bsc01 -n dev - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-scheduler-bsc01 -n dev - publish-sbx: - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-api-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-api-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-metrics-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-metrics-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-resolver-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-resolver-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-sync-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-sync-worker-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=0 deployment/sanctuary-scheduler-bsc01 -n sandbox - @kubectl --kubeconfig ~/.kube/config-staging scale --replicas=1 deployment/sanctuary-scheduler-bsc01 -n sandbox - -dev: assume login build-dev update-stg-kubeconfig publish-bsc - + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-api-bsc01 -n sandbox + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-foreign-chain-worker-bsc01 -n sandbox + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-metrics-worker-bsc01 -n sandbox + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-resolver-worker-bsc01 -n sandbox + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-sync-worker-bsc01 -n sandbox + @kubectl --kubeconfig ~/.kube/config-staging rollout restart deployment/sanctuary-scheduler-bsc01 -n sandbox + sbx: assume login update-stg-kubeconfig build-sbx publish-sbx