From be6194001c4814ec9d5bb3508fc284cc9a0ebd46 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 14 Aug 2025 13:44:50 +0200 Subject: [PATCH 01/45] add echo to pipeline --- .forgejo/workflows/createapp.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index e576bc1..dea187b 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -74,5 +74,7 @@ jobs: EOF ) + echo $CREATEAPP_JSON + echo create app curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body \ No newline at end of file From c69b2407e9f2d63e6b0d7c00ac2e1c642595c269 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 14 Aug 2025 13:48:55 +0200 Subject: [PATCH 02/45] fix: changes --- .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 dea187b..dc9f6bf 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -58,9 +58,9 @@ jobs: "key": { "organization": "edp-developer-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')", - "version": "$(echo ${{ steps.docker.outputs.version }} | tr -d '\n')" + "version": "${{ steps.docker.outputs.version }}" }, - "image_path": "${{ steps.docker.outputs.tags }}", + "image_path": "${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}:${{ steps.docker.outputs.version }}", "image_type": "Docker", "access_ports": "tcp:80", "default_flavor": { From ade331b1b2f7b32f56004ebb9fefb9ca808e6e97 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 14 Aug 2025 13:59:18 +0200 Subject: [PATCH 03/45] feat: add deleteapp pipeline --- .forgejo/workflows/deleteapp.yaml | 67 +++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/.forgejo/workflows/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml index e69de29..232ed97 100644 --- a/.forgejo/workflows/deleteapp.yaml +++ b/.forgejo/workflows/deleteapp.yaml @@ -0,0 +1,67 @@ +name: deleteapp + +on: + workflow_dispatch: + inputs: + a_app_region: + type: string + description: "Application Region e.g. EU" + default: EU + +env: + EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} + EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} + APP_REGION: ${{ inputs.a_app_region }} + +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 Curl + run: | + sudo apt update + sudo apt install -y curl jq + - + name: Delete edgeXR 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 < Date: Thu, 14 Aug 2025 14:16:28 +0200 Subject: [PATCH 04/45] feat(Dockerfile): add index.html --- Dockerfile | 6 +++++- index.html | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 index.html diff --git a/Dockerfile b/Dockerfile index 0071486..1f74906 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1,5 @@ -FROM nginx \ No newline at end of file +FROM nginx + +RUN rm -rf /usr/share/nginx/html/* + +ADD index.html /usr/share/nginx/html/ \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 0000000..657e011 --- /dev/null +++ b/index.html @@ -0,0 +1,5 @@ + + +

YE-HAW

+ + \ No newline at end of file From 7fa6ce9810e2629295b66dfe8cd7483cec215915 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 14 Aug 2025 14:49:50 +0200 Subject: [PATCH 05/45] Added EDP EdgeXR test page --- Dockerfile | 2 +- index.html | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 113 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f74906..c98e24d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM nginx RUN rm -rf /usr/share/nginx/html/* -ADD index.html /usr/share/nginx/html/ \ No newline at end of file +COPY --chmod=644 index.html /usr/share/nginx/html/ diff --git a/index.html b/index.html index 657e011..bc50627 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,112 @@ - - -

YE-HAW

- - \ No newline at end of file + + + + + + Centered Text with Image + + + + + +
+ + + +
+ + +

EDP meets EdgeXR

+
+ + + From 93069d1d03069cafaea6cd57ad8267c1c66104a0 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 14 Aug 2025 15:07:50 +0200 Subject: [PATCH 06/45] fix(docu): Keep the REST call documentation --- edge-calls.REST => hacks/edge-calls.REST | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename edge-calls.REST => hacks/edge-calls.REST (100%) diff --git a/edge-calls.REST b/hacks/edge-calls.REST similarity index 100% rename from edge-calls.REST rename to hacks/edge-calls.REST From 218a6af510059da06ee0c3e4b57561a2b1fc7605 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Wed, 20 Aug 2025 12:55:57 +0000 Subject: [PATCH 07/45] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index bc50627..58b0681 100644 --- a/index.html +++ b/index.html @@ -105,7 +105,7 @@
-

EDP meets EdgeXR

+

EDP meets Edge Connect

From ce4146300900d8029c09325ed8646c3fe6f7d182 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Wed, 20 Aug 2025 13:00:34 +0000 Subject: [PATCH 08/45] Update .forgejo/workflows/createapp.yaml --- .forgejo/workflows/createapp.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index dc9f6bf..c6ce843 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -54,22 +54,24 @@ jobs: CREATEAPP_JSON=$(cat < Date: Wed, 20 Aug 2025 13:08:08 +0000 Subject: [PATCH 09/45] Update .forgejo/workflows/createapp.yaml --- .forgejo/workflows/createapp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index c6ce843..c676f5a 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -70,7 +70,7 @@ jobs: }, "serverless_config": {}, "deployment_generator": "kubernetes-basic", - "deployment_manifest": "apiVersion: v1\nkind: Service\nmetadata:\n name: alemal-go-ws-customlatest-tcp\n labels:\n run: alemal-go-ws-customlatest\nspec:\n type: LoadBalancer\n ports:\n - name: tcp80\n protocol: TCP\n port: 80\n targetPort: 80\n selector:\n run: alemal-go-ws-customlatest\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: alemal-go-ws-customlatest-deployment\nspec:\n replicas: 1\n selector:\n matchLabels:\n run: alemal-go-ws-customlatest\n template:\n metadata:\n labels:\n run: alemal-go-ws-customlatest\n mexDeployGen: kubernetes-basic\n spec:\n volumes:\n imagePullSecrets:\n - name: mtr.devops.telekom.de\n containers:\n - name: alemal-go-ws-customlatest\n image: docker.io/library/nginx:1.29\n imagePullPolicy: Always\n ports:\n - containerPort: 80\n protocol: TCP\n\n" + "deployment_manifest": "apiVersion: v1\nkind: Service\nmetadata:\n name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-tcp\n labels:\n run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\nspec:\n type: LoadBalancer\n ports:\n - name: tcp80\n protocol: TCP\n port: 80\n targetPort: 80\n selector:\n run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-deployment\nspec:\n replicas: 1\n selector:\n matchLabels:\n run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n template:\n metadata:\n labels:\n run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n mexDeployGen: kubernetes-basic\n spec:\n volumes:\n containers:\n - name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n image: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}:${{ steps.docker.outputs.version }}\n imagePullPolicy: Always\n ports:\n - containerPort: 80\n protocol: TCP\n\n" } } EOF From f3367e988152cc4f1c183938b302541c6e4d64bc Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 21 Aug 2025 12:28:32 +0000 Subject: [PATCH 10/45] Delete hacks/edge-calls.REST --- hacks/edge-calls.REST | 87 ------------------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 hacks/edge-calls.REST diff --git a/hacks/edge-calls.REST b/hacks/edge-calls.REST deleted file mode 100644 index 122786d..0000000 --- a/hacks/edge-calls.REST +++ /dev/null @@ -1,87 +0,0 @@ -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login HTTP/1.1 -content-type: application/json - -{ - "password": "password", - "username": "email" -} - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/org/create HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg -content-type: application/json - -{ - "Address": "edp-developer-framework address", - "Name": "edp-developer-framework", - "Phone": "01234567890", - "Type": "developer" -} - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/org/show HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/user/show HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/ShowApp HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg - -{ - "App": { - "key": { - "organization": "edp-developer-framework", - "name": "HelloWorldAuto", - "version": "1.0" - } - }, - "Region": "EU" -} - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg -content-type: application/json - -{ - "App": { - "key": { - "organization": "edp-developer-framework", - "name": "HelloWorldAuto", - "version": "1.0" - }, - "image_path": "edp.buildth.ing/devfw-cicd/fibonacci_pipeline:development", - "image_type": "Docker", - "access_ports": "tcp:80", - "default_flavor": { - "name": "EU.small" - }, - "deployment": "docker", - "required_outbound_connections": null - }, - "Region": "EU" -} - -### - -POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteApp HTTP/1.1 -Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg - -{ - "App": { - "key": { - "organization": "edp-developer-framework", - "name": "HelloWorldAuto", - "version": "1.0" - } - }, - "Region": "EU" -} From b32609f5138208cdd55d99c67d1a29c112f5e6f9 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 21 Aug 2025 12:29:02 +0000 Subject: [PATCH 11/45] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 58b0681..44a390f 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - Centered Text with Image + EDP meets Edge Connect