From 6bff48cf4dde778152a486b8159ff2a0833286fd Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 27 May 2025 10:20:39 +0200
Subject: [PATCH] remote cluster change domainnames
---
.../kubernetes/RemoteClusterManager.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 36ae7abb5..1ce39f84b 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -151,11 +151,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
.state(KClusterState.UNKNOWN)
.contactEmail(view.getContactEmail())
.currentStateSince(OffsetDateTime.now())
- .domains(!view.getDomainNames().isEmpty() ? view.getDomainNames().stream().map(d -> {
- Optional<Domain> dom = domainService.findDomain(d);
- return dom.orElse(null);
- }
- ).toList() : Collections.emptyList())
+ .domains(prepareList(view))
.build(),
file);
@@ -170,6 +166,17 @@ public class RemoteClusterManager implements ClusterMonitoringService {
return null;
}
+ private List<Domain> prepareList(RemoteClusterView view) {
+ if (view == null || view.getDomainNames() == null) {
+ return Collections.emptyList();
+ }
+ return view.getDomainNames().stream().map(d -> {
+ Optional<Domain> dom = domainService.findDomain(d);
+ return dom.orElse(null);
+ }
+ ).toList();
+ }
+
public RemoteClusterView updateCluster(RemoteClusterView cluster, Long id) {
Optional<KCluster> entity = clusterRepository.findById(id);
@@ -332,7 +339,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
public void removeCluster(Long id) {
try {
- if(clusterRepository.existsById(id)) {
+ if (clusterRepository.existsById(id)) {
this.clusterRepository.deleteById(id);
}
} catch (RuntimeException ex) {
--
GitLab