From 81006d192b24db40a0ed6163d8b8ffd0253d7bbe Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:18:13 +0200 Subject: [PATCH 1/6] ci: Changed workflow to trigger deploy after build using the commit sha in image tags --- .forgejo/workflows/build.yaml | 3 +++ .forgejo/workflows/deploy.yaml | 9 +++++++++ k8s-deployment.yaml | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 3d1a205..a1cf071 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -26,6 +26,9 @@ jobs: id: docker with: images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} + tags: | + type=sha + type=ref,event=tag - name: Login to registry uses: docker/login-action@v3 diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index aafe9c6..804a6d5 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,6 +1,10 @@ name: deploy on: + workflow_run: + workflows: [build] + types: + - completed workflow_dispatch: jobs: @@ -11,6 +15,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Replace Image Version + runs: | + sed -i "s/###IMAGETAG###/${{ github.sha }}/g" ./EdgeConnectConfig.yaml + cat ./EdgeConnectConfig.yaml + - name: Deploy action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main id: deploy diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index 348b6f8..15dd6d6 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -32,7 +32,7 @@ spec: volumes: containers: - name: edgeconnect-coder - image: nginx:latest + image: ###IMAGETAG### imagePullPolicy: Always ports: - containerPort: 80 From a36a9ed8f6d04f768ab677b50b4727267e2746fe Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:28:50 +0200 Subject: [PATCH 2/6] ci: Changed sha tag name, using docker tag in deployment --- .forgejo/workflows/build.yaml | 2 +- .forgejo/workflows/deploy.yaml | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a1cf071..728b67d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -27,7 +27,7 @@ jobs: with: images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} tags: | - type=sha + type=sha,prefix= type=ref,event=tag - name: Login to registry diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 804a6d5..b099c7e 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -15,9 +15,29 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Repository meta + id: repository + run: | + registry=${{ github.server_url }} + registry=${registry##http*://} + echo "registry=${registry}" >> "$GITHUB_OUTPUT" + echo "registry=${registry}" + repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')" + echo "repository=${repository}" >> "$GITHUB_OUTPUT" + echo "repository=${repository}" + + - name: Docker meta + uses: docker/metadata-action@v5 + id: docker + with: + images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} + tags: | + type=sha,prefix= + - name: Replace Image Version - runs: | - sed -i "s/###IMAGETAG###/${{ github.sha }}/g" ./EdgeConnectConfig.yaml + run: | + echo sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml + sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml cat ./EdgeConnectConfig.yaml - name: Deploy action From 06d7f5f9806f0c48ef2e62cd64278b079a6f67e9 Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:31:48 +0200 Subject: [PATCH 3/6] ci: hardcoded image coordinates --- .forgejo/workflows/deploy.yaml | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index b099c7e..aa178e6 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -15,29 +15,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Repository meta - id: repository - run: | - registry=${{ github.server_url }} - registry=${registry##http*://} - echo "registry=${registry}" >> "$GITHUB_OUTPUT" - echo "registry=${registry}" - repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')" - echo "repository=${repository}" >> "$GITHUB_OUTPUT" - echo "repository=${repository}" - - - name: Docker meta - uses: docker/metadata-action@v5 - id: docker - with: - images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} - tags: | - type=sha,prefix= - - name: Replace Image Version run: | - echo sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml - sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml + echo sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml + sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml cat ./EdgeConnectConfig.yaml - name: Deploy action From a9f67e4eb02a8a3c3fb33c2678a7cb9c53d686ad Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:39:52 +0200 Subject: [PATCH 4/6] ci: Fixed sha --- .forgejo/workflows/deploy.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index aa178e6..1ad7501 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -17,9 +17,11 @@ jobs: - name: Replace Image Version run: | - echo sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml - sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml - cat ./EdgeConnectConfig.yaml + sha="${{ github.sha }}" + shortSha="${sha:0:7}" + echo sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml + sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml + cat ./k8s-deployment.yaml - name: Deploy action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main From eb74d0576520ca9b57590b8403c580d7a2fbed93 Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:42:52 +0200 Subject: [PATCH 5/6] ci: cleanup --- .forgejo/workflows/deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 1ad7501..db43a60 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -19,9 +19,8 @@ jobs: run: | sha="${{ github.sha }}" shortSha="${sha:0:7}" - echo sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml + echo "Setting image version to: edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}" sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml - cat ./k8s-deployment.yaml - name: Deploy action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main From 7a3e958d1bf4e498fa2a7716e4442b89b67ed9ae Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Wed, 8 Oct 2025 15:35:25 +0200 Subject: [PATCH 6/6] ci: Hooking up the deploy workflow after a tag is being built --- .forgejo/workflows/build.yaml | 4 ++++ .forgejo/workflows/deploy.yaml | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 728b67d..a5cb897 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -50,3 +50,7 @@ jobs: allow: network.host network: host tags: ${{ steps.docker.outputs.tags }} + + - name: Deploy + uses: ./.forgejo/workflows/deploy.yaml + if: startsWith(github.ref, 'refs/tags/v') diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index db43a60..8fef05d 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,10 +1,7 @@ name: deploy on: - workflow_run: - workflows: [build] - types: - - completed + workflow_call: workflow_dispatch: jobs: