From b79f28d2c77863f911d9203e95ec70bd2f44bed9 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Mon, 20 Oct 2025 12:11:33 +0000 Subject: [PATCH 01/10] EdgeConnectConfig.yaml aktualisiert --- EdgeConnectConfig.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml index 37bde30..d18781b 100644 --- a/EdgeConnectConfig.yaml +++ b/EdgeConnectConfig.yaml @@ -2,7 +2,7 @@ # How does it differ from the EdgeXR API? kind: edgeconnect-deployment metadata: - name: "edge-app-demo" # name could be used for appName + name: "garm-app-demo" # name could be used for appName spec: # dockerApp: # Docker is OBSOLETE # appVersion: "1.0.0" From dcbabc4f67c5e89e6940b6627d1f090ccd75be27 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Mon, 20 Oct 2025 12:12:16 +0000 Subject: [PATCH 02/10] k8s-deployment.yaml aktualisiert --- k8s-deployment.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index 15dd6d6..6f44933 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: edgeconnect-coder-tcp + name: garm labels: - run: edgeconnect-coder + run: garm spec: type: LoadBalancer ports: @@ -12,26 +12,26 @@ spec: port: 80 targetPort: 80 selector: - run: edgeconnect-coder + run: garm --- apiVersion: apps/v1 kind: Deployment metadata: - name: edgeconnect-coder-deployment + name: garm spec: replicas: 1 selector: matchLabels: - run: edgeconnect-coder + run: garm template: metadata: labels: - run: edgeconnect-coder + run: garm mexDeployGen: kubernetes-basic spec: volumes: containers: - - name: edgeconnect-coder + - name: garm image: ###IMAGETAG### imagePullPolicy: Always ports: From a748cc08b4a303fad0659c994a72a5e9fbc46918 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Mon, 20 Oct 2025 12:14:40 +0000 Subject: [PATCH 03/10] k8s-deployment.yaml aktualisiert --- k8s-deployment.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index 6f44933..12a9758 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -1,19 +1,3 @@ -apiVersion: v1 -kind: Service -metadata: - name: garm - labels: - run: garm -spec: - type: LoadBalancer - ports: - - name: tcp80 - protocol: TCP - port: 80 - targetPort: 80 - selector: - run: garm ---- apiVersion: apps/v1 kind: Deployment metadata: From 12657eb4c4aa2fb59725d5fe20df235c647f1f15 Mon Sep 17 00:00:00 2001 From: "Daniel.Sy" Date: Mon, 20 Oct 2025 12:18:17 +0000 Subject: [PATCH 04/10] k8s-deployment.yaml aktualisiert --- k8s-deployment.yaml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index 12a9758..3e884be 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -1,23 +1,15 @@ -apiVersion: apps/v1 -kind: Deployment +apiVersion: v1 +kind: Pod metadata: name: garm + labels: + run: garm + mexDeployGen: kubernetes-basic spec: - replicas: 1 - selector: - matchLabels: - run: garm - template: - metadata: - labels: - run: garm - mexDeployGen: kubernetes-basic - spec: - volumes: - containers: - - name: garm - image: ###IMAGETAG### - imagePullPolicy: Always - ports: - - containerPort: 80 - protocol: TCP + containers: + - name: garm + image: ###IMAGETAG### + imagePullPolicy: Always + ports: + - containerPort: 80 + protocol: TCP From 83297a158772970b8e8e3549cff248f0f68f68f3 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Mon, 20 Oct 2025 14:56:55 +0000 Subject: [PATCH 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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 }}