Fix url splitting & kubernetes service deleting

InseeFrLab · May 4, 2020 · 4908704 · 4908704
1 parent 0e0fc6d
commit 4908704
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java
@@ -147,13 +147,16 @@ public UninstallService destroyService(Region region, User user, final String pa
         HelmInstallService helmService = getHelmInstallService(region);
         int status = 0;
         if (bulk) {
+            // If bulk in kub we ignore the path and delete every helm release
             HelmLs[] releases = getHelmInstallService(region).listChartInstall(namespace);
             for (int i = 0; i <releases.length; i++){
-                status = Math.max(0,helmService.uninstaller(path,namespace));
+                status = Math.max(0,helmService.uninstaller(releases[i].getName(),namespace));
             }
         }
         else {
-            status = getHelmInstallService(region).uninstaller(path, namespace);
+            // Strip / if present
+            String cannonicalPath = path.startsWith("/") ? path.substring(1) : path;
+            status = getHelmInstallService(region).uninstaller(cannonicalPath, namespace);
         }
 
         result.setSuccess(status == 0);

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/MarathonAppsService.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/MarathonAppsService.java
@@ -336,7 +336,8 @@ private fr.insee.onyxia.model.service.Service mapAppToService(App app) {
 
         List<String> uris = new ArrayList<String>();
         if (app.getLabels().containsKey("ONYXIA_URL")) {
-            uris.add(app.getLabels().get("ONYXIA_URL"));
+            String onyxiaUrls = app.getLabels().get("ONYXIA_URL");
+            uris.addAll(Arrays.asList(onyxiaUrls.split(",")));
         }
         service.setUrls(uris);
         List<String> internalUrls = new ArrayList<String>();