From c6ad7d4232d2740f30320cbec4432a5a4d9cbed5 Mon Sep 17 00:00:00 2001 From: kazhamiakin Date: Mon, 22 Jul 2024 13:07:27 +0200 Subject: [PATCH] Support for platform-related labels --- .../dhub/rm/config/ApplicationProperties.java | 9 +++++++++ .../dhub/rm/controller/MainController.java | 2 ++ src/main/resources/application.yaml | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/it/smartcommunitylab/dhub/rm/config/ApplicationProperties.java b/src/main/java/it/smartcommunitylab/dhub/rm/config/ApplicationProperties.java index 49bc2e3..85f0490 100644 --- a/src/main/java/it/smartcommunitylab/dhub/rm/config/ApplicationProperties.java +++ b/src/main/java/it/smartcommunitylab/dhub/rm/config/ApplicationProperties.java @@ -8,6 +8,7 @@ public class ApplicationProperties { private String url; + private String coreName; public String getUrl() { return url; @@ -16,4 +17,12 @@ public String getUrl() { public void setUrl(String applicationUrl) { this.url = applicationUrl; } + + public String getCoreName() { + return coreName; + } + + public void setCoreName(String coreName) { + this.coreName = coreName; + } } diff --git a/src/main/java/it/smartcommunitylab/dhub/rm/controller/MainController.java b/src/main/java/it/smartcommunitylab/dhub/rm/controller/MainController.java index 7c16770..b841474 100644 --- a/src/main/java/it/smartcommunitylab/dhub/rm/controller/MainController.java +++ b/src/main/java/it/smartcommunitylab/dhub/rm/controller/MainController.java @@ -74,6 +74,8 @@ public String console(Model model, HttpServletRequest request) { } } + config.put("REACT_APP_CORE_NAME", applicationProperties.getCoreName()); + model.addAttribute("config", config); return "console.html"; } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 66806a2..eb02111 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -23,6 +23,7 @@ server: # application application.url: ${APPLICATION_URL:} +application.core-name: ${KRM_APPLICATION_CORE_NAME:dhcore} #kubernetes kubernetes: @@ -74,4 +75,5 @@ management: access: roles: - role: ROLE_USER - resources: "*" \ No newline at end of file + resources: "*" +