Use a single node type in controller

1 files changed, 3 insertions, 8 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainer.java
index f3dac2be22e..436cb7e634d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainer.java
@@ -13,8 +13,6 @@ import com.yahoo.vespa.hosted.controller.restapi.cost.config.SelfHostedCostConfi
 import java.time.Clock;
 import java.time.Duration;
 import java.util.EnumSet;
-import java.util.Objects;
-import java.util.logging.Logger;
 
 /**
  * Periodically calculate and store cost allocation for properties.
@@ -24,8 +22,6 @@ import java.util.logging.Logger;
  */
 public class CostReportMaintainer extends Maintainer {
 
-    private static final Logger log = Logger.getLogger(CostReportMaintainer.class.getName());
-
     private final CostReportConsumer consumer;
     private final NodeRepository nodeRepository;
     private final Clock clock;
@@ -36,13 +32,11 @@ public class CostReportMaintainer extends Maintainer {
     public CostReportMaintainer(Controller controller, Duration interval,
                                 CostReportConsumer consumer,
                                 JobControl jobControl,
-                                NodeRepository nodeRepository,
-                                Clock clock,
                                 SelfHostedCostConfig selfHostedCostConfig) {
         super(controller, interval, jobControl, "CostReportMaintainer", EnumSet.of(SystemName.main));
         this.consumer = consumer;
-        this.nodeRepository = Objects.requireNonNull(nodeRepository, "node repository must be non-null");
-        this.clock = clock;
+        this.nodeRepository = controller.configServer().nodeRepository();
+        this.clock = controller.clock();
         this.selfHostedCostConfig = selfHostedCostConfig;
     }
 
@@ -50,4 +44,5 @@ public class CostReportMaintainer extends Maintainer {
     protected void maintain() {
         consumer.Consume(CostCalculator.resourceShareByPropertyToCsv(nodeRepository, controller(), clock, selfHostedCostConfig, CloudName.from("yahoo")));
     }
+
 }