Merge pull request #11798 from vespa-engine/mpolden/controller-node-repo-client

Handle combined cluster type in controller's node-repository client

1 files changed, 1 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
index acc2180f743..88c1a48653a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterInfoMaintainer.java
@@ -4,12 +4,11 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.hosted.controller.Application;
-import com.yahoo.vespa.hosted.controller.Instance;
 import com.yahoo.vespa.hosted.controller.Controller;
+import com.yahoo.vespa.hosted.controller.Instance;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
-import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeRepositoryNode;
 import com.yahoo.vespa.hosted.controller.application.ClusterInfo;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 
@@ -41,10 +40,6 @@ public class ClusterInfoMaintainer extends Maintainer {
         this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository();
     }
 
-    private static String clusterId(NodeRepositoryNode node) {
-        return node.getMembership().clusterid;
-    }
-
     private Map<ClusterSpec.Id, ClusterInfo> getClusterInfo(List<Node> nodes) {
         Map<ClusterSpec.Id, ClusterInfo> infoMap = new HashMap<>();