From 9f18130ac1c926596ee75719ae8fb29853a1e954 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 10:23:47 +0100 Subject: [PATCH 01/23] Add upload and update fileStore stage image --- .github/workflows/fileserver-container.yml | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index a487c880..7195f86a 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -50,6 +50,51 @@ jobs: secrets: temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + upload-stage-image: + name: Upload image to staging registry + needs: build-multi-architecture + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.5.1 + with: + environment: stage + service_name: 'file-server' + deployment_name: 'flowforge-file' + container_name: 'file-storage' + deploy: false + image: ${{ needs.build-multi-architecture.outputs.image }} + secrets: + aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} + + update-stage-image: + name: Update staging deployment + needs: upload-stage-image + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + repository: 'flowfuse/CloudProject' + ref: 'ci-flowfuse-helm' + token: ${{ secrets.GITHUB_TOKEN }} + path: 'cloudproject' + - name: Install yq + uses: alexellis/arkade-get@master + with: + yq: 4.42.1 + - name: Update staging deployment + run: | + image_value="${{ needs.build-multi-architecture.outputs.image }}" + cd cloudproject + yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml + git config --global user.name 'GitHub Actions' + git config --global user.email 'github-actions@github.com' + git add ./cloudproject/staging/flowfuse-values.yaml + git commit -m "Update staging image value" + git push + + deploy-stage: if: github.ref_name == 'main' name: Deploy to staging environment From 0dec6a49c9844a5f704aac9ce4aeef7f54c24156 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 10:36:12 +0100 Subject: [PATCH 02/23] Fix repository name in workflow file --- .github/workflows/fileserver-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 7195f86a..9f8fa87d 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -75,7 +75,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - repository: 'flowfuse/CloudProject' + repository: 'FlowFuse/CloudProject' ref: 'ci-flowfuse-helm' token: ${{ secrets.GITHUB_TOKEN }} path: 'cloudproject' From 872b83dc61ea7acfbc955ec2c21511a0fc08eadc Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 11:01:59 +0100 Subject: [PATCH 03/23] Add token generation and push changes to ci-flowfuse-helm branch --- .github/workflows/fileserver-container.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 9f8fa87d..fe72981d 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -72,12 +72,18 @@ jobs: needs: upload-stage-image runs-on: ubuntu-latest steps: + - name: Generate a token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.GH_BOT_APP_ID }} + private_key: ${{ secrets.GH_BOT_APP_KEY }} - name: Checkout uses: actions/checkout@v4 with: repository: 'FlowFuse/CloudProject' ref: 'ci-flowfuse-helm' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ steps.generate_token.outputs.token }} path: 'cloudproject' - name: Install yq uses: alexellis/arkade-get@master @@ -86,14 +92,18 @@ jobs: - name: Update staging deployment run: | image_value="${{ needs.build-multi-architecture.outputs.image }}" - cd cloudproject - yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml + yq e ".forge.fileStore.image = \"$image_value\"" -i ./cloudproject/staging/flowfuse-values.yaml git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./cloudproject/staging/flowfuse-values.yaml git commit -m "Update staging image value" - git push - + - name: Push changes + uses: ad-m/github-push-action@v0.8.0 + with: + directory: './cloudproject' + branch: ci-flowfuse-helm + force: true + github_token: ${{ steps.generate_token.outputs.token }} deploy-stage: if: github.ref_name == 'main' From 611008e0933f2ecedd0f97a07b44d243ae426aef Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 11:19:00 +0100 Subject: [PATCH 04/23] Update yq version to v4.42.1 --- .github/workflows/fileserver-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index fe72981d..9539935c 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -88,7 +88,7 @@ jobs: - name: Install yq uses: alexellis/arkade-get@master with: - yq: 4.42.1 + yq: v4.42.1 - name: Update staging deployment run: | image_value="${{ needs.build-multi-architecture.outputs.image }}" From d6089860f8cecf86d68f6e3fb2036176d6e81dcf Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 11:30:29 +0100 Subject: [PATCH 05/23] Update staging deployment configuration --- .github/workflows/fileserver-container.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 9539935c..b031a9aa 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -69,7 +69,9 @@ jobs: update-stage-image: name: Update staging deployment - needs: upload-stage-image + needs: + - build-multi-architecture + - upload-stage-image runs-on: ubuntu-latest steps: - name: Generate a token @@ -92,10 +94,11 @@ jobs: - name: Update staging deployment run: | image_value="${{ needs.build-multi-architecture.outputs.image }}" - yq e ".forge.fileStore.image = \"$image_value\"" -i ./cloudproject/staging/flowfuse-values.yaml + cd ./cloudproject + yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' - git add ./cloudproject/staging/flowfuse-values.yaml + git add ./staging/flowfuse-values.yaml git commit -m "Update staging image value" - name: Push changes uses: ad-m/github-push-action@v0.8.0 From a34c99d443df75a2648200b4a8e71a87a7b5800c Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 12:11:18 +0100 Subject: [PATCH 06/23] Update fileserver-container.yml workflow to use feat-ecr-image-output version --- .github/workflows/fileserver-container.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index b031a9aa..49d5a1d8 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -53,7 +53,7 @@ jobs: upload-stage-image: name: Upload image to staging registry needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.5.1 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output with: environment: stage service_name: 'file-server' @@ -69,9 +69,7 @@ jobs: update-stage-image: name: Update staging deployment - needs: - - build-multi-architecture - - upload-stage-image + needs: upload-stage-image runs-on: ubuntu-latest steps: - name: Generate a token @@ -86,15 +84,13 @@ jobs: repository: 'FlowFuse/CloudProject' ref: 'ci-flowfuse-helm' token: ${{ steps.generate_token.outputs.token }} - path: 'cloudproject' - name: Install yq uses: alexellis/arkade-get@master with: yq: v4.42.1 - name: Update staging deployment run: | - image_value="${{ needs.build-multi-architecture.outputs.image }}" - cd ./cloudproject + image_value="${{ needs.upload-stage-image.outputs.image }}" yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' @@ -103,7 +99,6 @@ jobs: - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: - directory: './cloudproject' branch: ci-flowfuse-helm force: true github_token: ${{ steps.generate_token.outputs.token }} From 8d77e456720a775468e2f6165cc644578a51b851 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 12:23:28 +0100 Subject: [PATCH 07/23] Debug push --- .github/workflows/fileserver-container.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 49d5a1d8..4d037fbd 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -95,7 +95,9 @@ jobs: git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./staging/flowfuse-values.yaml - git commit -m "Update staging image value" + git commit -m "Update file-server staging image" + git remote -v + git status - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: From cc0ebdf063d19123f6470755bd86d0978987539d Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Wed, 13 Mar 2024 12:41:00 +0100 Subject: [PATCH 08/23] Debug image tag --- .github/workflows/fileserver-container.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 4d037fbd..bff99082 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -90,6 +90,7 @@ jobs: yq: v4.42.1 - name: Update staging deployment run: | + full_image_value="${{ needs.upload-stage-image.outputs.full_image }}" image_value="${{ needs.upload-stage-image.outputs.image }}" yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml git config --global user.name 'GitHub Actions' From 05fa2726aaf7c96b7d57db2b2bc9f5f60e9d6178 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Thu, 14 Mar 2024 08:49:27 +0100 Subject: [PATCH 09/23] Add AWS credentials --- .github/workflows/fileserver-container.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index bff99082..2e51a569 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -71,7 +71,16 @@ jobs: name: Update staging deployment needs: upload-stage-image runs-on: ubuntu-latest + environment: stage steps: + - name: Configure AWS credentials + id: aws-config + uses: aws-actions/configure-aws-credentials@v3 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + aws-region: eu-west-1 + mask-aws-account-id: true - name: Generate a token id: generate_token uses: tibdex/github-app-token@v1 @@ -90,8 +99,7 @@ jobs: yq: v4.42.1 - name: Update staging deployment run: | - full_image_value="${{ needs.upload-stage-image.outputs.full_image }}" - image_value="${{ needs.upload-stage-image.outputs.image }}" + image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-stage-image.outputs.image }}" yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' @@ -103,6 +111,7 @@ jobs: uses: ad-m/github-push-action@v0.8.0 with: branch: ci-flowfuse-helm + repository: 'FlowFuse/CloudProject' force: true github_token: ${{ steps.generate_token.outputs.token }} From 1212d96cca29b97c4f41127a84042762cd48d13d Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Thu, 14 Mar 2024 11:03:56 +0100 Subject: [PATCH 10/23] Add production jobs for file-server --- .github/workflows/fileserver-container.yml | 67 +++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 2e51a569..e9b27547 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -68,7 +68,7 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} update-stage-image: - name: Update staging deployment + name: Update staging image needs: upload-stage-image runs-on: ubuntu-latest environment: stage @@ -115,6 +115,71 @@ jobs: force: true github_token: ${{ steps.generate_token.outputs.token }} + upload-production-image: + name: Upload image to production registry + needs: build-multi-architecture + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + with: + environment: production + service_name: 'file-server' + deployment_name: 'flowforge-file' + container_name: 'file-storage' + deploy: false + image: ${{ needs.build-multi-architecture.outputs.image }} + secrets: + aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} + + update-production-image: + name: Update production image + needs: upload-production-image + runs-on: ubuntu-latest + environment: production + steps: + - name: Configure AWS credentials + id: aws-config + uses: aws-actions/configure-aws-credentials@v3 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + aws-region: eu-west-1 + mask-aws-account-id: true + - name: Generate a token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.GH_BOT_APP_ID }} + private_key: ${{ secrets.GH_BOT_APP_KEY }} + - name: Checkout + uses: actions/checkout@v4 + with: + repository: 'FlowFuse/CloudProject' + ref: 'ci-flowfuse-helm' + token: ${{ steps.generate_token.outputs.token }} + - name: Install yq + uses: alexellis/arkade-get@master + with: + yq: v4.42.1 + - name: Update staging deployment + run: | + image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-production-image.outputs.image }}" + yq e ".forge.fileStore.image = \"$image_value\"" -i ./production/flowfuse-values.yaml + git config --global user.name 'GitHub Actions' + git config --global user.email 'github-actions@github.com' + git add ./production/flowfuse-values.yaml + git commit -m "Update file-server staging image" + git remote -v + git status + - name: Push changes + uses: ad-m/github-push-action@v0.8.0 + with: + branch: ci-flowfuse-helm + repository: 'FlowFuse/CloudProject' + force: true + github_token: ${{ steps.generate_token.outputs.token }} + deploy-stage: if: github.ref_name == 'main' name: Deploy to staging environment From 9fbbe7846de983036bc7011b83d557a6055074b9 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Thu, 14 Mar 2024 12:55:02 +0100 Subject: [PATCH 11/23] Update flowforge container deployment approach --- .github/workflows/flowforge-container.yml | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 1c52c108..c5ad2cad 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -50,6 +50,136 @@ jobs: image_name: 'forge-k8s' secrets: temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + + upload-stage-image: + # if: github.ref_name == 'main' + name: Upload image to staging registry + needs: build-multi-architecture + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + with: + environment: stage + service_name: 'forge-k8s' + deployment_name: flowforge + container_name: forge + deploy: false + image: ${{ needs.build-multi-architecture.outputs.image }} + secrets: + aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} + + update-stage-image: + # if: github.ref_name == 'main' + name: Update staging image + needs: upload-stage-image + runs-on: ubuntu-latest + environment: stage + steps: + - name: Configure AWS credentials + id: aws-config + uses: aws-actions/configure-aws-credentials@v3 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + aws-region: eu-west-1 + mask-aws-account-id: true + - name: Generate a token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.GH_BOT_APP_ID }} + private_key: ${{ secrets.GH_BOT_APP_KEY }} + - name: Checkout + uses: actions/checkout@v4 + with: + repository: 'FlowFuse/CloudProject' + ref: 'ci-flowfuse-helm' + token: ${{ steps.generate_token.outputs.token }} + - name: Install yq + uses: alexellis/arkade-get@master + with: + yq: v4.42.1 + - name: Update staging deployment + run: | + image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-stage-image.outputs.image }}" + yq e ".forge.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml + git config --global user.name 'GitHub Actions' + git config --global user.email 'github-actions@github.com' + git add ./staging/flowfuse-values.yaml + git commit -m "Update forge staging image" + - name: Push changes + uses: ad-m/github-push-action@v0.8.0 + with: + branch: ci-flowfuse-helm + repository: 'FlowFuse/CloudProject' + force: true + github_token: ${{ steps.generate_token.outputs.token }} + + upload-production-image: + # if: github.ref_name == 'main' + name: Upload image to production registry + needs: build-multi-architecture + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + with: + environment: production + service_name: 'forge-k8s' + deployment_name: flowforge + container_name: forge + deploy: false + image: ${{ needs.build-multi-architecture.outputs.image }} + secrets: + aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} + eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} + + update-production-image: + # if: github.ref_name == 'main' + name: Update production image + needs: upload-production-image + runs-on: ubuntu-latest + environment: production + steps: + - name: Configure AWS credentials + id: aws-config + uses: aws-actions/configure-aws-credentials@v3 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} + aws-region: eu-west-1 + mask-aws-account-id: true + - name: Generate a token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.GH_BOT_APP_ID }} + private_key: ${{ secrets.GH_BOT_APP_KEY }} + - name: Checkout + uses: actions/checkout@v4 + with: + repository: 'FlowFuse/CloudProject' + ref: 'ci-flowfuse-helm' + token: ${{ steps.generate_token.outputs.token }} + - name: Install yq + uses: alexellis/arkade-get@master + with: + yq: v4.42.1 + - name: Update production deployment + run: | + image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-production-image.outputs.image }}" + yq e ".forge.image = \"$image_value\"" -i ./production/flowfuse-values.yaml + git config --global user.name 'GitHub Actions' + git config --global user.email 'github-actions@github.com' + git add ./production/flowfuse-values.yaml + git commit -m "Update forge production image" + - name: Push changes + uses: ad-m/github-push-action@v0.8.0 + with: + branch: ci-flowfuse-helm + repository: 'FlowFuse/CloudProject' + force: true + github_token: ${{ steps.generate_token.outputs.token }} deploy-stage: if: github.ref_name == 'main' From 02a5c309745ca35a879f6a33ecc25aaaa6e31d7a Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Thu, 14 Mar 2024 12:55:48 +0100 Subject: [PATCH 12/23] Update file-server staging and production images --- .github/workflows/fileserver-container.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index e9b27547..bcb68816 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -51,6 +51,7 @@ jobs: temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} upload-stage-image: + if: github.ref_name == 'main' name: Upload image to staging registry needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output @@ -68,6 +69,7 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} update-stage-image: + if: github.ref_name == 'main' name: Update staging image needs: upload-stage-image runs-on: ubuntu-latest @@ -105,8 +107,6 @@ jobs: git config --global user.email 'github-actions@github.com' git add ./staging/flowfuse-values.yaml git commit -m "Update file-server staging image" - git remote -v - git status - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: @@ -116,6 +116,7 @@ jobs: github_token: ${{ steps.generate_token.outputs.token }} upload-production-image: + if: github.ref_name == 'main' name: Upload image to production registry needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output @@ -133,6 +134,7 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} update-production-image: + if: github.ref_name == 'main' name: Update production image needs: upload-production-image runs-on: ubuntu-latest @@ -170,8 +172,6 @@ jobs: git config --global user.email 'github-actions@github.com' git add ./production/flowfuse-values.yaml git commit -m "Update file-server staging image" - git remote -v - git status - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: From 4fe5af1f32f9318d47b3c4bf864934fa97079712 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 13:54:29 +0200 Subject: [PATCH 13/23] chore: Update AWS configure-aws-credentials action to v4 --- .github/workflows/flowforge-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index c75549ff..6719743a 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -78,7 +78,7 @@ jobs: steps: - name: Configure AWS credentials id: aws-config - uses: aws-actions/configure-aws-credentials@v3 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} From 5987c8bc38bd2943b77f8bf4ff905d641c1d89ba Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 13:55:29 +0200 Subject: [PATCH 14/23] Update AWS configure-aws-credentials action to v4 --- .github/workflows/flowforge-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 6719743a..58e920ef 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -143,7 +143,7 @@ jobs: steps: - name: Configure AWS credentials id: aws-config - uses: aws-actions/configure-aws-credentials@v3 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_ACCESS_KEY_SECRET }} From 708e36319be90cb7c1d81db6434e11881e75fe2d Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 14:03:19 +0200 Subject: [PATCH 15/23] Update deploy_container_image.yml to use v0.19.0 --- .github/workflows/flowforge-container.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 58e920ef..b77baf07 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -55,7 +55,7 @@ jobs: # if: github.ref_name == 'main' name: Upload image to staging registry needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: stage service_name: 'forge-k8s' @@ -120,7 +120,7 @@ jobs: # if: github.ref_name == 'main' name: Upload image to production registry needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: production service_name: 'forge-k8s' @@ -185,7 +185,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to staging environment needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: stage service_name: 'forge-k8s' @@ -202,7 +202,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: production service_name: 'forge-k8s' From aa1d5fb0d371d9cc7329a7dbba59c096cca2f984 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 14:04:49 +0200 Subject: [PATCH 16/23] Update container image build and deployment workflows to use v0.19.0 --- .github/workflows/fileserver-container.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index cce8da1e..40494854 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -29,7 +29,7 @@ concurrency: jobs: build: name: Build single-architecture container images - uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.19.0 with: image_name: 'file-server' package_dependencies: | @@ -44,7 +44,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.19.0 with: image_name: 'file-server' secrets: @@ -54,7 +54,7 @@ jobs: if: github.ref_name == 'main' name: Upload image to staging registry needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: stage service_name: 'file-server' @@ -119,7 +119,7 @@ jobs: if: github.ref_name == 'main' name: Upload image to production registry needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@feat-ecr-image-output + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: production service_name: 'file-server' @@ -184,7 +184,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to staging environment needs: build-multi-architecture - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: stage service_name: 'file-server' @@ -201,7 +201,7 @@ jobs: if: github.ref_name == 'main' name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] - uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 with: environment: production service_name: 'file-server' From fde27c75003a0873af5f3bbab0850c6380e88c1c Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 14:15:11 +0200 Subject: [PATCH 17/23] Update flowforge-container.yml to use v0.19.0 for multi-architecture container image build --- .github/workflows/flowforge-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index b77baf07..7f65d7c6 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -45,7 +45,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.10.0 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.19.0 with: image_name: 'forge-k8s' secrets: From ca87b392b61eda3907a89351fb2d4334095e8f9c Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 14:27:25 +0200 Subject: [PATCH 18/23] Update container image build workflows to use v0.10.0 --- .github/workflows/fileserver-container.yml | 2 +- .github/workflows/flowforge-container.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 40494854..fdea8a82 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -44,7 +44,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.19.0 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.10.0 with: image_name: 'file-server' secrets: diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 7f65d7c6..b77baf07 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -45,7 +45,7 @@ jobs: build-multi-architecture: name: Build multi-architecture container image needs: build - uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.19.0 + uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.10.0 with: image_name: 'forge-k8s' secrets: From 68cbba266625950b0733a5c94cf86fbc5e41daa9 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 19:38:10 +0200 Subject: [PATCH 19/23] Improve commit message --- .github/workflows/fileserver-container.yml | 4 ++-- .github/workflows/flowforge-container.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index fdea8a82..434c1f84 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -106,7 +106,7 @@ jobs: git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./staging/flowfuse-values.yaml - git commit -m "Update file-server staging image" + git commit -m "Update file-server staging image to ${{ needs.upload-stage-image.outputs.image }}" - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: @@ -171,7 +171,7 @@ jobs: git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./production/flowfuse-values.yaml - git commit -m "Update file-server staging image" + git commit -m "Update file-server staging image ${{ needs.upload-production-image.outputs.image }}" - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index b77baf07..b9b3ad53 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -107,7 +107,7 @@ jobs: git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./staging/flowfuse-values.yaml - git commit -m "Update forge staging image" + git commit -m "Update forge staging image to ${{ needs.upload-stage-image.outputs.image }}" - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: @@ -172,7 +172,7 @@ jobs: git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@github.com' git add ./production/flowfuse-values.yaml - git commit -m "Update forge production image" + git commit -m "Update forge production image to ${{ needs.upload-production-image.outputs.image }}" - name: Push changes uses: ad-m/github-push-action@v0.8.0 with: From 304ee279ff21d09fdd655b281d7b01f918bb5bb3 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 19:41:07 +0200 Subject: [PATCH 20/23] Set common github username and password --- .github/workflows/fileserver-container.yml | 8 ++++---- .github/workflows/flowforge-container.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 434c1f84..7c9a9cea 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -103,8 +103,8 @@ jobs: run: | image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-stage-image.outputs.image }}" yq e ".forge.fileStore.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml - git config --global user.name 'GitHub Actions' - git config --global user.email 'github-actions@github.com' + git config --global user.name "GitHub Actions Bot" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"' git add ./staging/flowfuse-values.yaml git commit -m "Update file-server staging image to ${{ needs.upload-stage-image.outputs.image }}" - name: Push changes @@ -168,8 +168,8 @@ jobs: run: | image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-production-image.outputs.image }}" yq e ".forge.fileStore.image = \"$image_value\"" -i ./production/flowfuse-values.yaml - git config --global user.name 'GitHub Actions' - git config --global user.email 'github-actions@github.com' + git config --global user.name "GitHub Actions Bot" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update file-server staging image ${{ needs.upload-production-image.outputs.image }}" - name: Push changes diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index b9b3ad53..ca287dbb 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -104,8 +104,8 @@ jobs: run: | image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-stage-image.outputs.image }}" yq e ".forge.image = \"$image_value\"" -i ./staging/flowfuse-values.yaml - git config --global user.name 'GitHub Actions' - git config --global user.email 'github-actions@github.com' + git config --global user.name "GitHub Actions Bot" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./staging/flowfuse-values.yaml git commit -m "Update forge staging image to ${{ needs.upload-stage-image.outputs.image }}" - name: Push changes @@ -169,8 +169,8 @@ jobs: run: | image_value="${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ needs.upload-production-image.outputs.image }}" yq e ".forge.image = \"$image_value\"" -i ./production/flowfuse-values.yaml - git config --global user.name 'GitHub Actions' - git config --global user.email 'github-actions@github.com' + git config --global user.name "GitHub Actions Bot" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update forge production image to ${{ needs.upload-production-image.outputs.image }}" - name: Push changes From 599356c1007b344bcf05d42d5e714b967f1676bc Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 19:43:06 +0200 Subject: [PATCH 21/23] Replace git push action with single command --- .github/workflows/fileserver-container.yml | 16 ++-------------- .github/workflows/flowforge-container.yml | 17 +++-------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index 7c9a9cea..a4bc9170 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -107,13 +107,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"' git add ./staging/flowfuse-values.yaml git commit -m "Update file-server staging image to ${{ needs.upload-stage-image.outputs.image }}" - - name: Push changes - uses: ad-m/github-push-action@v0.8.0 - with: - branch: ci-flowfuse-helm - repository: 'FlowFuse/CloudProject' - force: true - github_token: ${{ steps.generate_token.outputs.token }} + git push origin ci-flowfuse-helm upload-production-image: if: github.ref_name == 'main' @@ -172,13 +166,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update file-server staging image ${{ needs.upload-production-image.outputs.image }}" - - name: Push changes - uses: ad-m/github-push-action@v0.8.0 - with: - branch: ci-flowfuse-helm - repository: 'FlowFuse/CloudProject' - force: true - github_token: ${{ steps.generate_token.outputs.token }} + git push origin ci-flowfuse-helm deploy-stage: if: github.ref_name == 'main' diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index ca287dbb..a9f86005 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -108,13 +108,8 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./staging/flowfuse-values.yaml git commit -m "Update forge staging image to ${{ needs.upload-stage-image.outputs.image }}" - - name: Push changes - uses: ad-m/github-push-action@v0.8.0 - with: - branch: ci-flowfuse-helm - repository: 'FlowFuse/CloudProject' - force: true - github_token: ${{ steps.generate_token.outputs.token }} + git push origin ci-flowfuse-helm + upload-production-image: # if: github.ref_name == 'main' @@ -173,13 +168,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update forge production image to ${{ needs.upload-production-image.outputs.image }}" - - name: Push changes - uses: ad-m/github-push-action@v0.8.0 - with: - branch: ci-flowfuse-helm - repository: 'FlowFuse/CloudProject' - force: true - github_token: ${{ steps.generate_token.outputs.token }} + git push origin ci-flowfuse-helm deploy-stage: if: github.ref_name == 'main' From 353b0b22a573a17de05399383e51c951f0259017 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Mon, 24 Jun 2024 20:37:17 +0200 Subject: [PATCH 22/23] Prepare for a review --- .github/workflows/fileserver-container.yml | 8 ++++---- .github/workflows/flowforge-container.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index a4bc9170..ec8c28d1 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -93,7 +93,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'FlowFuse/CloudProject' - ref: 'ci-flowfuse-helm' + ref: 'main' token: ${{ steps.generate_token.outputs.token }} - name: Install yq uses: alexellis/arkade-get@master @@ -107,7 +107,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"' git add ./staging/flowfuse-values.yaml git commit -m "Update file-server staging image to ${{ needs.upload-stage-image.outputs.image }}" - git push origin ci-flowfuse-helm + git push origin main upload-production-image: if: github.ref_name == 'main' @@ -152,7 +152,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'FlowFuse/CloudProject' - ref: 'ci-flowfuse-helm' + ref: 'main' token: ${{ steps.generate_token.outputs.token }} - name: Install yq uses: alexellis/arkade-get@master @@ -166,7 +166,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update file-server staging image ${{ needs.upload-production-image.outputs.image }}" - git push origin ci-flowfuse-helm + git push origin main deploy-stage: if: github.ref_name == 'main' diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index a9f86005..661f37e6 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -52,7 +52,7 @@ jobs: temporary_registry_token: ${{ secrets.GITHUB_TOKEN }} upload-stage-image: - # if: github.ref_name == 'main' + if: github.ref_name == 'main' name: Upload image to staging registry needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 @@ -70,7 +70,7 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} update-stage-image: - # if: github.ref_name == 'main' + if: github.ref_name == 'main' name: Update staging image needs: upload-stage-image runs-on: ubuntu-latest @@ -94,7 +94,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'FlowFuse/CloudProject' - ref: 'ci-flowfuse-helm' + ref: 'main' token: ${{ steps.generate_token.outputs.token }} - name: Install yq uses: alexellis/arkade-get@master @@ -108,11 +108,11 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./staging/flowfuse-values.yaml git commit -m "Update forge staging image to ${{ needs.upload-stage-image.outputs.image }}" - git push origin ci-flowfuse-helm + git push origin main upload-production-image: - # if: github.ref_name == 'main' + if: github.ref_name == 'main' name: Upload image to production registry needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 @@ -130,7 +130,7 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} update-production-image: - # if: github.ref_name == 'main' + if: github.ref_name == 'main' name: Update production image needs: upload-production-image runs-on: ubuntu-latest @@ -154,7 +154,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'FlowFuse/CloudProject' - ref: 'ci-flowfuse-helm' + ref: 'main' token: ${{ steps.generate_token.outputs.token }} - name: Install yq uses: alexellis/arkade-get@master @@ -168,7 +168,7 @@ jobs: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git add ./production/flowfuse-values.yaml git commit -m "Update forge production image to ${{ needs.upload-production-image.outputs.image }}" - git push origin ci-flowfuse-helm + git push origin main deploy-stage: if: github.ref_name == 'main' From 349a3dde781aac75731941517c5d37585791214e Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Thu, 27 Jun 2024 13:01:34 +0200 Subject: [PATCH 23/23] Disable old deployment approach --- .github/workflows/fileserver-container.yml | 6 ++++-- .github/workflows/flowforge-container.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml index ec8c28d1..41e67b44 100644 --- a/.github/workflows/fileserver-container.yml +++ b/.github/workflows/fileserver-container.yml @@ -169,7 +169,8 @@ jobs: git push origin main deploy-stage: - if: github.ref_name == 'main' + # if: github.ref_name == 'main' + if: false name: Deploy to staging environment needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 @@ -186,7 +187,8 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} deploy-prod: - if: github.ref_name == 'main' + # if: github.ref_name == 'main' + if: false name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml index 661f37e6..50534535 100644 --- a/.github/workflows/flowforge-container.yml +++ b/.github/workflows/flowforge-container.yml @@ -171,7 +171,8 @@ jobs: git push origin main deploy-stage: - if: github.ref_name == 'main' + # if: github.ref_name == 'main' + if: false name: Deploy to staging environment needs: build-multi-architecture uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0 @@ -188,7 +189,8 @@ jobs: eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }} deploy-prod: - if: github.ref_name == 'main' + # if: github.ref_name == 'main' + if: false name: Deploy to production environment needs: [build-multi-architecture, deploy-stage] uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.19.0