From 1291e72b6f787e9b5bd20b7984d4884d3d3f5de8 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 29 Aug 2025 09:25:36 +0000 Subject: [PATCH 01/25] Update .forgejo/workflows/createapp.yaml --- .forgejo/workflows/createapp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index beb83a6..e43f89c 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -31,8 +31,8 @@ on: required: true env: - EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR2_PLATFORM_USERNAME }} - EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR2_PLATFORM_PASSWORD }} + EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} + EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} APP_REGION: ${{ inputs.a_app_region }} APP_FLAVOR: ${{ inputs.b_app_flavor }} CLOUDLET: ${{ inputs.c_cloudlet }} From 84a45769355ea2bc8ec9deaf6869e3c2f28cb695 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Mon, 15 Sep 2025 15:24:19 +0000 Subject: [PATCH 02/25] .forgejo/workflows/createapp.yaml aktualisiert --- .forgejo/workflows/createapp.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index e43f89c..52dbab8 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -69,7 +69,7 @@ jobs: run: | set -e echo login - EDGEXR_TOKEN="$(curl -X POST https://mc.orca.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)" + EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)" CREATEAPP_JSON=$(cat < Date: Tue, 23 Sep 2025 15:17:09 +0200 Subject: [PATCH 03/25] =?UTF-8?q?feat(action):=20=E2=9C=A8=20Use=20deploy?= =?UTF-8?q?=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/createaction.yaml | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .forgejo/workflows/createaction.yaml diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml new file mode 100644 index 0000000..6033729 --- /dev/null +++ b/.forgejo/workflows/createaction.yaml @@ -0,0 +1,47 @@ +name: createapp + +on: + workflow_dispatch: + inputs: + a_app_region: + type: string + description: "Application Region e.g. EU" + default: EU + required: true + b_app_flavor: + type: string + description: "Application Flavor e.g. EU.small" + default: EU.small + required: true + c_cloudlet: + type: choice + options: + - Amsterdam-OTC + - Hamburg + - Leipzig + - Munich + - Berlin + - Frankfurt + - Magdeburg-OTC + - Bonn + - Magdeburg + - crm-vm-2 + description: "Cloudlet location" + default: Munich + required: true + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - + name: Deploy action + uses: edp.buildth.ing/deploy + id: deploy + with: + region: ${{ inputs.a_app_region }} + flavor: ${{ inputs.b_app_flavor }} + cloudlet: ${{ inputs.c_cloudlet }} + edgexr_platform_username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} + edgexr_platform_password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} From 6279a296bf4ddd204ae91f1379be8ad63c496111 Mon Sep 17 00:00:00 2001 From: Daniel Sy Date: Tue, 23 Sep 2025 15:22:40 +0200 Subject: [PATCH 04/25] =?UTF-8?q?fix(action):=20=F0=9F=90=9B=20fix=20actio?= =?UTF-8?q?n=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/createaction.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml index 6033729..aa96138 100644 --- a/.forgejo/workflows/createaction.yaml +++ b/.forgejo/workflows/createaction.yaml @@ -37,7 +37,7 @@ jobs: steps: - name: Deploy action - uses: edp.buildth.ing/deploy + uses: DevFW-CICD/edgeconnect-platform-demo/deploy@main id: deploy with: region: ${{ inputs.a_app_region }} From ef0335bda0e200d0456d4f50770ac90e4ffff17e Mon Sep 17 00:00:00 2001 From: Daniel Sy Date: Tue, 23 Sep 2025 15:29:03 +0200 Subject: [PATCH 05/25] =?UTF-8?q?fix(action):=20=F0=9F=9A=9A=20Use=20corre?= =?UTF-8?q?ct=20action=20default=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/createaction.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml index aa96138..fb45b00 100644 --- a/.forgejo/workflows/createaction.yaml +++ b/.forgejo/workflows/createaction.yaml @@ -37,7 +37,7 @@ jobs: steps: - name: Deploy action - uses: DevFW-CICD/edgeconnect-platform-demo/deploy@main + uses: https://edp.buildth.ing/DevFW-CICD/edgeconnect-platform-demo/deploy@main id: deploy with: region: ${{ inputs.a_app_region }} From 11e8511b64c2801ef2a1258b70be8f4d01dcaa00 Mon Sep 17 00:00:00 2001 From: Daniel Sy Date: Tue, 23 Sep 2025 15:31:32 +0200 Subject: [PATCH 06/25] =?UTF-8?q?fix(action):=20=F0=9F=9A=91=20fix=20actio?= =?UTF-8?q?n=20url=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/createaction.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml index fb45b00..6405403 100644 --- a/.forgejo/workflows/createaction.yaml +++ b/.forgejo/workflows/createaction.yaml @@ -37,7 +37,7 @@ jobs: steps: - name: Deploy action - uses: https://edp.buildth.ing/DevFW-CICD/edgeconnect-platform-demo/deploy@main + uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-action/deploy@main id: deploy with: region: ${{ inputs.a_app_region }} From 6ba6a78b12bd1d67f18738cdf52ad8c663e37c53 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 2 Oct 2025 14:14:37 +0200 Subject: [PATCH 07/25] feat(edgeconnect): Added sdk action --- .forgejo/workflows/createaction.yaml | 47 --------- .forgejo/workflows/createapp.yaml | 136 --------------------------- .forgejo/workflows/deleteapp.yaml | 116 ----------------------- .forgejo/workflows/deploy.yaml | 16 ++++ EdgeConnectConfig.yaml | 29 ++++++ k8s-deployment.yaml | 39 ++++++++ 6 files changed, 84 insertions(+), 299 deletions(-) delete mode 100644 .forgejo/workflows/createaction.yaml delete mode 100644 .forgejo/workflows/createapp.yaml delete mode 100644 .forgejo/workflows/deleteapp.yaml create mode 100644 .forgejo/workflows/deploy.yaml create mode 100644 EdgeConnectConfig.yaml create mode 100644 k8s-deployment.yaml diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml deleted file mode 100644 index 6405403..0000000 --- a/.forgejo/workflows/createaction.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: createapp - -on: - workflow_dispatch: - inputs: - a_app_region: - type: string - description: "Application Region e.g. EU" - default: EU - required: true - b_app_flavor: - type: string - description: "Application Flavor e.g. EU.small" - default: EU.small - required: true - c_cloudlet: - type: choice - options: - - Amsterdam-OTC - - Hamburg - - Leipzig - - Munich - - Berlin - - Frankfurt - - Magdeburg-OTC - - Bonn - - Magdeburg - - crm-vm-2 - description: "Cloudlet location" - default: Munich - required: true - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - - name: Deploy action - uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-action/deploy@main - id: deploy - with: - region: ${{ inputs.a_app_region }} - flavor: ${{ inputs.b_app_flavor }} - cloudlet: ${{ inputs.c_cloudlet }} - edgexr_platform_username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} - edgexr_platform_password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml deleted file mode 100644 index 52dbab8..0000000 --- a/.forgejo/workflows/createapp.yaml +++ /dev/null @@ -1,136 +0,0 @@ -name: createapp - -on: - workflow_dispatch: - inputs: - a_app_region: - type: string - description: "Application Region e.g. EU" - default: EU - required: true - b_app_flavor: - type: string - description: "Application Flavor e.g. EU.small" - default: EU.small - required: true - c_cloudlet: - type: choice - options: - - Amsterdam-OTC - - Hamburg - - Leipzig - - Munich - - Berlin - - Frankfurt - - Magdeburg-OTC - - Bonn - - Magdeburg - - crm-vm-2 - description: "Cloudlet location" - default: Munich - required: true - -env: - EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} - EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} - APP_REGION: ${{ inputs.a_app_region }} - APP_FLAVOR: ${{ inputs.b_app_flavor }} - CLOUDLET: ${{ inputs.c_cloudlet }} - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - - 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 }} - - - name: Install Dependencies - run: | - sudo apt update - sudo apt install -y curl jq - - - name: Create Edge Connect App - run: | - set -e - echo login - EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)" - - CREATEAPP_JSON=$(cat <> "$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 }} - - - name: Install Dependencies - run: | - sudo apt update - sudo apt install -y curl jq - - - name: Delete Edge Connect App Instance - run: | - set -e - echo login - EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)" - - DELETEAPPINSTANCE_JSON=$(cat < Date: Thu, 2 Oct 2025 14:22:25 +0200 Subject: [PATCH 08/25] fix(action): fixed input parameter name --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 7f6b0c0..984ac0e 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -13,4 +13,4 @@ jobs: uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main id: deploy with: - config-file: ./EdgeConnectConfig.yaml + configFile: ./EdgeConnectConfig.yaml From 9cbe3875b925073e6cdcbd095cd3e5ca2c4e7264 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 2 Oct 2025 14:24:45 +0200 Subject: [PATCH 09/25] fix(pipeline): added checkout action --- .forgejo/workflows/deploy.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 984ac0e..2488f50 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -8,8 +8,10 @@ jobs: runs-on: ubuntu-22.04 steps: - - - name: Deploy action + - name: Checkout + uses: actions/checkout@v4 + + - name: Deploy action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main id: deploy with: From a5ebeff98971e7ec30afd6dcb84a347d64102e8d Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 2 Oct 2025 14:33:04 +0200 Subject: [PATCH 10/25] fix(pipeline): added edge connect login data --- .forgejo/workflows/deploy.yaml | 3 +++ EdgeConnectConfig.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 2488f50..aafe9c6 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,3 +16,6 @@ jobs: id: deploy with: configFile: ./EdgeConnectConfig.yaml + baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live + username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} + password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 37bde30..4c3fe02 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -12,7 +12,7 @@ spec: appVersion: "1.0.0" manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs, infraTemplate: - - organization: "edp2" + - organization: "dev-framework" region: "EU" cloudletOrg: "TelekomOP" cloudletName: "Munich" From 81006d192b24db40a0ed6163d8b8ffd0253d7bbe Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Thu, 2 Oct 2025 16:18:13 +0200 Subject: [PATCH 11/25] 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 12/25] 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 13/25] 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 14/25] 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 15/25] 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 147cea0736b66919c48ea77ed62fd828621f681a Mon Sep 17 00:00:00 2001 From: "stephan.lo" Date: Wed, 15 Oct 2025 08:20:43 +0000 Subject: [PATCH 16/25] chore(): changed target organisation from dev-framework to edp2 --- EdgeConnectConfig.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 4c3fe02..37bde30 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -12,7 +12,7 @@ spec: appVersion: "1.0.0" manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs, infraTemplate: - - organization: "dev-framework" + - organization: "edp2" region: "EU" cloudletOrg: "TelekomOP" cloudletName: "Munich" From c197daefa06c2c36748d3fad5be21103e4ea5b85 Mon Sep 17 00:00:00 2001 From: Stephan Lo Date: Wed, 15 Oct 2025 11:10:15 +0200 Subject: [PATCH 17/25] feat(edgeconnect-demo-delete): added delete action for IPCEICIS-5882 --- .forgejo/workflows/delete.yaml | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .forgejo/workflows/delete.yaml diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml new file mode 100644 index 0000000..a4e3421 --- /dev/null +++ b/.forgejo/workflows/delete.yaml @@ -0,0 +1,53 @@ +name: delete + +on: + workflow_dispatch: + inputs: + name: + type: string + description: "App name to delete" + required: true + appVersion: + type: string + description: "Version of the app to delete" + required: true + org: + type: string + description: "Organization of the app to delete" + required: true + region: + type: string + description: "Region of the app to delete" + required: true + cloudletOrg: + type: string + description: "Cloudlet organization of the app to delete" + required: true + cloudlet: + type: string + description: "Cloudlet of the app to delete" + required: true + +env: + INPUT_NAME: ${{ inputs.name }} + INPUT_APPVERSION: ${{ inputs.appVersion }} + INPUT_ORG: ${{ inputs.org }} + INPUT_REGION: ${{ inputs.region }} + INPUT_CLOUDLET_ORG: ${{ inputs.cloudletOrg }} + INPUT_CLOUDLET: ${{ inputs.cloudlet }} + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Delete action + uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-delete-action@main + id: delete + with: + baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live + username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} + password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} From ace8efa150492bc812b3c246362f846555b7d52a Mon Sep 17 00:00:00 2001 From: Stephan Lo Date: Wed, 15 Oct 2025 11:17:40 +0200 Subject: [PATCH 18/25] feat(delete-action): sort the input params in forgejo action --- .forgejo/workflows/delete.yaml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml index a4e3421..c7997c5 100644 --- a/.forgejo/workflows/delete.yaml +++ b/.forgejo/workflows/delete.yaml @@ -3,38 +3,44 @@ name: delete on: workflow_dispatch: inputs: - name: + a_name: type: string description: "App name to delete" required: true - appVersion: + default: "" + b_appVersion: type: string description: "Version of the app to delete" required: true - org: + default: "" + c_org: type: string description: "Organization of the app to delete" required: true - region: + default: "" + d_region: type: string description: "Region of the app to delete" required: true - cloudletOrg: + default: "" + e_cloudletOrg: type: string description: "Cloudlet organization of the app to delete" required: true - cloudlet: + default: "" + f_cloudlet: type: string description: "Cloudlet of the app to delete" required: true + default: "" env: - INPUT_NAME: ${{ inputs.name }} - INPUT_APPVERSION: ${{ inputs.appVersion }} - INPUT_ORG: ${{ inputs.org }} - INPUT_REGION: ${{ inputs.region }} - INPUT_CLOUDLET_ORG: ${{ inputs.cloudletOrg }} - INPUT_CLOUDLET: ${{ inputs.cloudlet }} + INPUT_NAME: ${{ inputs.a_name }} + INPUT_APPVERSION: ${{ inputs.b_appVersion }} + INPUT_ORG: ${{ inputs.c_org }} + INPUT_REGION: ${{ inputs.d_region }} + INPUT_CLOUDLET_ORG: ${{ inputs.e_cloudletOrg }} + INPUT_CLOUDLET: ${{ inputs.f_cloudlet }} jobs: build: From e9d4a8acef41cfbfb8a5d6ca59a538d04479d21d Mon Sep 17 00:00:00 2001 From: Stephan Lo Date: Wed, 15 Oct 2025 11:38:58 +0200 Subject: [PATCH 19/25] fix(edgeconnect-delete-action): fix passing of env vars to the delete action --- .forgejo/workflows/delete.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml index c7997c5..94e1cbb 100644 --- a/.forgejo/workflows/delete.yaml +++ b/.forgejo/workflows/delete.yaml @@ -34,14 +34,6 @@ on: required: true default: "" -env: - INPUT_NAME: ${{ inputs.a_name }} - INPUT_APPVERSION: ${{ inputs.b_appVersion }} - INPUT_ORG: ${{ inputs.c_org }} - INPUT_REGION: ${{ inputs.d_region }} - INPUT_CLOUDLET_ORG: ${{ inputs.e_cloudletOrg }} - INPUT_CLOUDLET: ${{ inputs.f_cloudlet }} - jobs: build: runs-on: ubuntu-22.04 @@ -54,6 +46,12 @@ jobs: uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-delete-action@main id: delete with: + name: ${{ inputs.a_name }} + appVersion: ${{ inputs.b_appVersion }} + org: ${{ inputs.c_org }} + region: ${{ inputs.d_region }} + cloudletOrg: ${{ inputs.e_cloudletOrg }} + cloudlet: ${{ inputs.f_cloudlet }} baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} From 83297a158772970b8e8e3549cff248f0f68f68f3 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Mon, 20 Oct 2025 14:56:55 +0000 Subject: [PATCH 20/25] chore(edge-client): updated edge deployment manifest to sdk 2.0.1 --- EdgeConnectConfig.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 37bde30..931f029 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -3,17 +3,17 @@ kind: edgeconnect-deployment metadata: name: "edge-app-demo" # name could be used for appName + appVersion: "1.0.0" + organization: "edp2" spec: # dockerApp: # Docker is OBSOLETE # appVersion: "1.0.0" # manifestFile: "./docker-compose.yaml" # image: "https://registry-1.docker.io/library/nginx:latest" k8sApp: - appVersion: "1.0.0" manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs, infraTemplate: - - organization: "edp2" - region: "EU" + - region: "EU" cloudletOrg: "TelekomOP" cloudletName: "Munich" flavorName: "EU.small" From f190109025714f9402acef32249602ca883f231b Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Mon, 20 Oct 2025 17:07:06 +0200 Subject: [PATCH 21/25] chore(edgeplatform): switched to orca staging environment --- .forgejo/workflows/deploy.yaml | 2 +- EdgeConnectConfig.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index db43a60..ef26316 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -27,6 +27,6 @@ jobs: id: deploy with: configFile: ./EdgeConnectConfig.yaml - baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live + baseUrl: https://hub.apps.orca.platform.mg3.mdb.osc.live username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 931f029..2f65543 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -3,8 +3,8 @@ kind: edgeconnect-deployment metadata: name: "edge-app-demo" # name could be used for appName - appVersion: "1.0.0" - organization: "edp2" + appVersion: "1" + organization: "edp2-orca" spec: # dockerApp: # Docker is OBSOLETE # appVersion: "1.0.0" @@ -13,10 +13,10 @@ spec: k8sApp: manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs, infraTemplate: - - region: "EU" - cloudletOrg: "TelekomOP" - cloudletName: "Munich" - flavorName: "EU.small" + - region: "US" + cloudletOrg: "TelekomOp" + cloudletName: "gardener-shepherd-test" + flavorName: "defualt" network: outboundConnections: - protocol: "tcp" From 09ad5decdf54deec90c25e41b5e8986cd2aa65f3 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Mon, 20 Oct 2025 17:15:21 +0200 Subject: [PATCH 22/25] chore(edgeplatform): using new delete action syntax --- .forgejo/workflows/delete.yaml | 53 +++++++++------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml index 94e1cbb..f3d95d6 100644 --- a/.forgejo/workflows/delete.yaml +++ b/.forgejo/workflows/delete.yaml @@ -1,39 +1,12 @@ name: delete on: + workflow_run: + workflows: [build] + types: + - completed workflow_dispatch: - inputs: - a_name: - type: string - description: "App name to delete" - required: true - default: "" - b_appVersion: - type: string - description: "Version of the app to delete" - required: true - default: "" - c_org: - type: string - description: "Organization of the app to delete" - required: true - default: "" - d_region: - type: string - description: "Region of the app to delete" - required: true - default: "" - e_cloudletOrg: - type: string - description: "Cloudlet organization of the app to delete" - required: true - default: "" - f_cloudlet: - type: string - description: "Cloudlet of the app to delete" - required: true - default: "" - + jobs: build: runs-on: ubuntu-22.04 @@ -42,16 +15,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Replace Image Version + run: | + sha="${{ github.sha }}" + shortSha="${sha:0:7}" + 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 + - name: Delete action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-delete-action@main id: delete with: - name: ${{ inputs.a_name }} - appVersion: ${{ inputs.b_appVersion }} - org: ${{ inputs.c_org }} - region: ${{ inputs.d_region }} - cloudletOrg: ${{ inputs.e_cloudletOrg }} - cloudlet: ${{ inputs.f_cloudlet }} - baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live + configFile: ./EdgeConnectConfig.yaml + baseUrl: https://hub.apps.orca.platform.mg3.mdb.osc.live username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} From b8844249d4c77fd3f4a47d65c9a2da4632f49abe Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 24 Oct 2025 07:57:25 +0000 Subject: [PATCH 23/25] Update EdgeConnectConfig.yaml --- EdgeConnectConfig.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 2f65543..931f029 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -3,8 +3,8 @@ kind: edgeconnect-deployment metadata: name: "edge-app-demo" # name could be used for appName - appVersion: "1" - organization: "edp2-orca" + appVersion: "1.0.0" + organization: "edp2" spec: # dockerApp: # Docker is OBSOLETE # appVersion: "1.0.0" @@ -13,10 +13,10 @@ spec: k8sApp: manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs, infraTemplate: - - region: "US" - cloudletOrg: "TelekomOp" - cloudletName: "gardener-shepherd-test" - flavorName: "defualt" + - region: "EU" + cloudletOrg: "TelekomOP" + cloudletName: "Munich" + flavorName: "EU.small" network: outboundConnections: - protocol: "tcp" From 8076efc80adaa8e0e0f1cf2605099119eb602d28 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 24 Oct 2025 07:59:29 +0000 Subject: [PATCH 24/25] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index ef26316..db43a60 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -27,6 +27,6 @@ jobs: id: deploy with: configFile: ./EdgeConnectConfig.yaml - baseUrl: https://hub.apps.orca.platform.mg3.mdb.osc.live + baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} From caf5d0a7e83b6b2fe0731e67b50765ba61ab0981 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 24 Oct 2025 07:59:45 +0000 Subject: [PATCH 25/25] Update .forgejo/workflows/delete.yaml --- .forgejo/workflows/delete.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml index f3d95d6..f685492 100644 --- a/.forgejo/workflows/delete.yaml +++ b/.forgejo/workflows/delete.yaml @@ -27,6 +27,6 @@ jobs: id: delete with: configFile: ./EdgeConnectConfig.yaml - baseUrl: https://hub.apps.orca.platform.mg3.mdb.osc.live + baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}