- Remove cluster() from SystemInfo to only keep static information there.

- Instead provide only the cluster name.
- If you need cluster information have Cluster injected directly.

1 files changed, 1 insertions, 4 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
index d8298491944..e9325936157 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
@@ -3,14 +3,12 @@ package com.yahoo.container.jdisc;
 
 import ai.vespa.cloud.ApplicationId;
 import ai.vespa.cloud.Cloud;
-import ai.vespa.cloud.Cluster;
 import ai.vespa.cloud.Environment;
 import ai.vespa.cloud.Node;
 import ai.vespa.cloud.SystemInfo;
 import ai.vespa.cloud.Zone;
 import com.yahoo.component.annotation.Inject;
 import com.yahoo.cloud.config.ApplicationIdConfig;
-import com.yahoo.cloud.config.ClusterInfoConfig;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.container.QrConfig;
@@ -29,14 +27,13 @@ public class SystemInfoProvider extends AbstractComponent implements Provider<Sy
     @Inject
     public SystemInfoProvider(ConfigserverConfig csConfig,
                               QrConfig qrConfig,
-                              ClusterInfoConfig ciConfig,
                               ApplicationIdConfig applicationIdConfig) {
         this.instance = new SystemInfo(new ApplicationId(applicationIdConfig.tenant(),
                                                          applicationIdConfig.application(),
                                                          applicationIdConfig.instance()),
                                        new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()),
                                        new Cloud(csConfig.cloud()),
-                                       new Cluster(ciConfig.clusterId(), ciConfig.nodeCount(), ciConfig.nodeIndices()),
+                                       qrConfig.clustername(),
                                        new Node(qrConfig.nodeIndex()));
     }