From 445221f4a9ff0fc448abfddda78b3eabf99b1e5b Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 27 May 2025 14:02:58 +0200
Subject: [PATCH] map cluster to path if cluster is added
---
.../kubernetes/components/helm/HelmKServiceManager.java | 3 ++-
.../kubernetes/components/helm/HelmKServiceManagerTest.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java
index 753891c45..1cd6308ae 100644
--- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java
+++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java
@@ -75,7 +75,8 @@ public class HelmKServiceManager implements KServiceLifecycleManager {
namespaceService.namespace(serviceInfo.getDomain()),
serviceInfo.getDescriptiveDeploymentId().getValue(),
serviceInfo.getKubernetesTemplate(),
- createArgumentsMap(serviceInfo)
+ createArgumentsMap(serviceInfo),
+ serviceInfo.getRemoteCluster() != null ? serviceInfo.getRemoteCluster().getPathConfigFile() : null
);
}
diff --git a/src/test/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManagerTest.java b/src/test/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManagerTest.java
index 0ebf9adc9..b3e27ed59 100644
--- a/src/test/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManagerTest.java
+++ b/src/test/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManagerTest.java
@@ -119,7 +119,7 @@ public class HelmKServiceManagerTest {
eq("namespace"),
eq("descriptiveDeploymentId"),
k8sTemplateArg.capture(),
- argumentsArg.capture()
+ argumentsArg.capture(), null
);
assertThat(argumentsArg.getValue()).isNotEmpty();
assertThat(argumentsArg.getValue().size()).isEqualTo(11);
@@ -143,7 +143,7 @@ public class HelmKServiceManagerTest {
eq("namespace"),
eq("descriptiveDeploymentId"),
any(),
- any()
+ any(), null
);
}
--
GitLab