From a8e88712efeb9bcc40b119b9f70e0bf1b5b2b623 Mon Sep 17 00:00:00 2001 From: Andreas Pfau Date: Tue, 5 Nov 2024 09:52:44 +0100 Subject: [PATCH 1/2] chore(dashboard): changes the helm charts (#659) --- .../hosting/templates/deployment.yaml | 2 -- .../templates/index-html-configmap.yaml | 25 ++----------------- .../hosting/templates/nginx-configmap.yaml | 14 +++-------- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/ci/helm-charts/hosting/templates/deployment.yaml b/ci/helm-charts/hosting/templates/deployment.yaml index 5d9fdac6d..b7a554cf8 100644 --- a/ci/helm-charts/hosting/templates/deployment.yaml +++ b/ci/helm-charts/hosting/templates/deployment.yaml @@ -33,8 +33,6 @@ spec: ports: - name: dashboard containerPort: 80 - - name: exampleapp - containerPort: 81 resources: requests: cpu: "100m" diff --git a/ci/helm-charts/hosting/templates/index-html-configmap.yaml b/ci/helm-charts/hosting/templates/index-html-configmap.yaml index 66e83bb50..29c5ebcc9 100644 --- a/ci/helm-charts/hosting/templates/index-html-configmap.yaml +++ b/ci/helm-charts/hosting/templates/index-html-configmap.yaml @@ -9,31 +9,10 @@ data: CCLOUD - - - + - - - - exampleapp.html: | - - - - CCLOUD - - - - - - + src="https://dashboard.eu-de-1.cloud.sap/assets/landing_page_widget.js"> diff --git a/ci/helm-charts/hosting/templates/nginx-configmap.yaml b/ci/helm-charts/hosting/templates/nginx-configmap.yaml index 2ea3997a8..44435e6a9 100644 --- a/ci/helm-charts/hosting/templates/nginx-configmap.yaml +++ b/ci/helm-charts/hosting/templates/nginx-configmap.yaml @@ -6,17 +6,9 @@ metadata: data: nginx.conf: | server { - listen 80; - - location / { - root /usr/share/nginx/html; - index dashboard.html; - } - } - server { - listen 81; + listen 80; location / { - root /usr/share/nginx/html; - index exampleapp.html; + root /usr/share/nginx/html; + index dashboard.html; } } From 4150e46bfb8ef561bf763b1060d0b433157f172e Mon Sep 17 00:00:00 2001 From: Andreas Pfau Date: Tue, 5 Nov 2024 15:38:14 +0100 Subject: [PATCH 2/2] chore(ci): adds a timestamp to widget src url (#661) --- ci/helm-charts/hosting/templates/index-html-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-charts/hosting/templates/index-html-configmap.yaml b/ci/helm-charts/hosting/templates/index-html-configmap.yaml index 29c5ebcc9..3cccc7abd 100644 --- a/ci/helm-charts/hosting/templates/index-html-configmap.yaml +++ b/ci/helm-charts/hosting/templates/index-html-configmap.yaml @@ -13,6 +13,6 @@ data: + src="https://dashboard.eu-de-1.cloud.sap/assets/landing_page_widget.js?ts={{ now | date "20060102150405" }}">