From e8d23dad45d9b10b62153b7d5a30b0f9ad5e6466 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Wed, 27 Aug 2025 07:48:53 +0000 Subject: [PATCH 01/21] feat(DeleteAppInst added) --- .forgejo/workflows/deleteapp.yaml | 37 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml index dda37e7..f132c86 100644 --- a/.forgejo/workflows/deleteapp.yaml +++ b/.forgejo/workflows/deleteapp.yaml @@ -40,6 +40,35 @@ jobs: 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: Wed, 27 Aug 2025 08:02:00 +0000 Subject: [PATCH 02/21] Update .forgejo/workflows/deleteapp.yaml --- .forgejo/workflows/deleteapp.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml index f132c86..c87e19a 100644 --- a/.forgejo/workflows/deleteapp.yaml +++ b/.forgejo/workflows/deleteapp.yaml @@ -53,7 +53,10 @@ jobs: "appinst": { "key": { "organization": "edp-developer-framework", - "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance" + "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance", + "cloudlet_key": { + "organization": "TelekomOP" + } }, "app_key": { "organization": "edp-developer-framework", From 223bfe40af134ed314002797b2ef83e3902e1937 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Wed, 27 Aug 2025 08:09:33 +0000 Subject: [PATCH 03/21] Update .forgejo/workflows/deleteapp.yaml --- .forgejo/workflows/deleteapp.yaml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml index c87e19a..3c721d2 100644 --- a/.forgejo/workflows/deleteapp.yaml +++ b/.forgejo/workflows/deleteapp.yaml @@ -7,11 +7,27 @@ on: type: string description: "Application Region e.g. EU" default: EU + b_cloudlet: + type: choice + options: + - Amsterdam-OTC + - Hamburg + - Leipzig + - Munich + - Berlin + - Frankfurt + - Magdeburg-OTC + - Bonn + - Magdeburg + description: "Cloudlet e.g. EU.small" + 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 }} + CLOUDLET: ${{ inputs.b_cloudlet }} jobs: build: @@ -55,7 +71,8 @@ jobs: "organization": "edp-developer-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance", "cloudlet_key": { - "organization": "TelekomOP" + "organization": "TelekomOP", + "name": "${CLOUDLET}" } }, "app_key": { @@ -71,7 +88,7 @@ jobs: echo $DELETEAPPINSTANCE_JSON echo delete app instance - curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPPINSTANCE_JSON" --fail-with-body + curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPPINSTANCE_JSON" --fail-with-body || true - name: Delete Edge Connect App run: | From 223952c1273c2c4614acd7df984978f1036ecc6a Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 29 Aug 2025 09:09:36 +0000 Subject: [PATCH 04/21] Update .forgejo/workflows/createapp.yaml --- .forgejo/workflows/createapp.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index cc6fcf2..3e79624 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -25,13 +25,14 @@ on: - 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 }} + EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR2_PLATFORM_USERNAME }} + EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR2_PLATFORM_PASSWORD }} APP_REGION: ${{ inputs.a_app_region }} APP_FLAVOR: ${{ inputs.b_app_flavor }} CLOUDLET: ${{ inputs.c_cloudlet }} @@ -68,7 +69,7 @@ jobs: 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)" + 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)" CREATEAPP_JSON=$(cat < Date: Fri, 29 Aug 2025 09:23:31 +0000 Subject: [PATCH 05/21] Update .forgejo/workflows/createapp.yaml --- .forgejo/workflows/createapp.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index 3e79624..beb83a6 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -76,7 +76,7 @@ jobs: "region": "${APP_REGION}", "app": { "key": { - "organization": "edp-developer-framework", + "organization": "dev-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')", "version": "${{ steps.docker.outputs.version }}" }, @@ -110,7 +110,7 @@ jobs: "region": "${APP_REGION}", "appinst": { "key": { - "organization": "edp-developer-framework", + "organization": "dev-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance", "cloudlet_key": { "organization": "TelekomOP", @@ -118,7 +118,7 @@ jobs: } }, "app_key": { - "organization": "edp-developer-framework", + "organization": "dev-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')", "version": "${{ steps.docker.outputs.version }}" }, From 1291e72b6f787e9b5bd20b7984d4884d3d3f5de8 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 29 Aug 2025 09:25:36 +0000 Subject: [PATCH 06/21] 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 07/21] .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 08/21] =?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 09/21] =?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 10/21] =?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 11/21] =?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 12/21] 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 13/21] 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 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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: