Merge pull request #5330 from vespa-engine/bjorncs/client-cert

Bjorncs/client cert

2 files changed, 2 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
index f6c6d2c10db..b568b1ca6e4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
@@ -136,7 +136,7 @@ public class Controller extends AbstractComponent {
                                                           rotationsConfig,
                                                           nameService, configServerClient, artifactRepository,
                                                           routingGenerator, clock);
-        tenantController = new TenantController(this, db, curator, entityService, athenzClientFactory);
+        tenantController = new TenantController(this, db, curator, athenzClientFactory);
     }
     
     /** Returns the instance controlling tenants */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 0abf296a9a7..482b6a6f3a9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserId;
 import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFactory;
 import com.yahoo.vespa.hosted.controller.api.integration.athenz.ZmsClient;
-import com.yahoo.vespa.hosted.controller.api.integration.entity.EntityService;
 import com.yahoo.vespa.hosted.controller.persistence.ControllerDb;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 import com.yahoo.vespa.hosted.controller.persistence.PersistenceException;
@@ -44,15 +43,13 @@ public class TenantController {
     private final CuratorDb curator;
 
     private final AthenzClientFactory athenzClientFactory;
-    private final EntityService entityService;
 
-    public TenantController(Controller controller, ControllerDb db, CuratorDb curator, EntityService entityService,
+    public TenantController(Controller controller, ControllerDb db, CuratorDb curator,
                             AthenzClientFactory athenzClientFactory) {
         this.controller = controller;
         this.db = db;
         this.curator = curator;
         this.athenzClientFactory = athenzClientFactory;
-        this.entityService = entityService;
     }
 
     public List<Tenant> asList() {