From c197daefa06c2c36748d3fad5be21103e4ea5b85 Mon Sep 17 00:00:00 2001 From: Stephan Lo Date: Wed, 15 Oct 2025 11:10:15 +0200 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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 }}