From 6e259f722c8281b8ef269445339ff10af5182ba2 Mon Sep 17 00:00:00 2001 From: Artyom Belousov Date: Fri, 5 Jan 2024 22:28:04 +0300 Subject: [PATCH] Refactor deploy.yaml --- .github/workflows/deploy.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9a07c68..76c64c9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,7 +20,7 @@ jobs: - name: Build, tag, and push image to Yandex Cloud Container Registry env: - CR_REGISTRY: crp7gp50nf1pitkpk3hq + CR_REGISTRY: ${{ vars.CR_REGISTRY }} CR_REPOSITORY: mtg-price-bot IMAGE_TAG: ${{ github.sha }} run: | @@ -30,28 +30,25 @@ jobs: - name: Deploy Serverless Container id: deploy-sls-container uses: yc-actions/yc-sls-container-deploy@v2 - env: - secret: e6qb3muh98m0as2r1r4b - revision: e6q2tsf58jo5qtpjqkf5 with: yc-sa-json-credentials: ${{ secrets.YC_SA_JSON_CREDENTIALS }} container-name: mtg-price-bot - folder-id: b1g97q1g0epou1o6bu24 - revision-service-account-id: ajeomjp59v0jb9uiiq3k + folder-id: ${{ vars.FOLDER_ID }} + revision-service-account-id: ${{ vars.SERVICE_ACCOUNT }} revision-cores: 1 revision-memory: 128Mb revision-core-fraction: 100 revision-concurrency: 1 - revision-image-url: cr.yandex/crp7gp50nf1pitkpk3hq/mtg-price-bot:${{ github.sha }} + revision-image-url: cr.yandex/${{ vars.CR_REGISTRY }}/mtg-price-bot:${{ github.sha }} revision-execution-timeout: 10 revision-secrets: | - TELOXIDE_TOKEN=$secret/$revision/TELOXIDE_TOKEN - VK_TOKEN=$secret/$revision/VK_TOKEN - VK_GROUP_ID=$secret/$revision/VK_GROUP_ID - VK_SECRET=$secret/$revision/VK_SECRET - VK_CONFIRMATION_STRING=$secret/$revision/VK_CONFIRMATION_STRING - TG_SECRET=$secret/$revision/TG_SECRET - SCG_CLIENT_GUID=$secret/$revision/SCG_CLIENT_GUID + TELOXIDE_TOKEN=${{ vars.SECRET }}/${{ vars.REVISION }}/TELOXIDE_TOKEN + VK_TOKEN=${{ vars.SECRET }}/${{ vars.REVISION }}/VK_TOKEN + VK_GROUP_ID=${{ vars.SECRET }}/${{ vars.REVISION }}/VK_GROUP_ID + VK_SECRET=${{ vars.SECRET }}/${{ vars.REVISION }}/VK_SECRET + VK_CONFIRMATION_STRING=${{ vars.SECRET }}/${{ vars.REVISION }}/VK_CONFIRMATION_STRING + TG_SECRET=${{ vars.SECRET }}/${{ vars.REVISION }}/TG_SECRET + SCG_CLIENT_GUID=${{ vars.SECRET }}/${{ vars.REVISION }}/SCG_CLIENT_GUID - name: Deploy API Gateway id: deploy-gateway @@ -59,5 +56,5 @@ jobs: with: yc-sa-json-credentials: ${{ secrets.YC_SA_JSON_CREDENTIALS }} gateway-name: mtg-price-bot - folder-id: b1g97q1g0epou1o6bu24 + folder-id: ${{ vars.FOLDER_ID }} spec-file: apigw.yaml