permanent cert pool flag

3 files changed, 6 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainer.java
index 8f9b9b70639..e77bf52f567 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainer.java
@@ -6,7 +6,6 @@ import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.flags.BooleanFlag;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.IntFlag;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.StringFlag;
@@ -52,7 +51,7 @@ public class CertificatePoolMaintainer extends ControllerMaintainer {
         super(controller, interval);
         this.controller = controller;
         this.secretStore = controller.secretStore();
-        this.certPoolSize = Flags.CERT_POOL_SIZE.bindTo(controller.flagSource());
+        this.certPoolSize = PermanentFlags.CERT_POOL_SIZE.bindTo(controller.flagSource());
         this.useAlternateCertProvider = PermanentFlags.USE_ALTERNATIVE_ENDPOINT_CERTIFICATE_PROVIDER.bindTo(controller.flagSource());
         this.endpointCertificateAlgo = PermanentFlags.ENDPOINT_CERTIFICATE_ALGORITHM.bindTo(controller.flagSource());
         this.curator = controller.curator();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainerTest.java
index ca4ee5cd4d2..777594c487b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CertificatePoolMaintainerTest.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.jdisc.test.MockMetric;
-import com.yahoo.vespa.flags.Flags;
+import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateProviderMock;
 import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateRequest.DnsNameStatus;
@@ -23,7 +23,7 @@ public class CertificatePoolMaintainerTest {
 
     @Test
     void new_certs_are_requested_until_limit() {
-        tester.flagSource().withIntFlag(Flags.CERT_POOL_SIZE.id(), 3);
+        tester.flagSource().withIntFlag(PermanentFlags.CERT_POOL_SIZE.id(), 3);
         assertNumCerts(1);
         assertNumCerts(2);
         assertNumCerts(3);
@@ -32,7 +32,7 @@ public class CertificatePoolMaintainerTest {
 
     @Test
     void cert_contains_expected_names() {
-        tester.flagSource().withIntFlag(Flags.CERT_POOL_SIZE.id(), 1);
+        tester.flagSource().withIntFlag(PermanentFlags.CERT_POOL_SIZE.id(), 1);
         assertNumCerts(1);
         EndpointCertificateProviderMock endpointCertificateProvider = (EndpointCertificateProviderMock) tester.controller().serviceRegistry().endpointCertificateProvider();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
index 3f26b0c7b1f..dbc3e08d569 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainerTest.java
@@ -6,7 +6,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.jdisc.test.MockMetric;
-import com.yahoo.vespa.flags.Flags;
+import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificate;
 import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateProviderMock;
@@ -169,7 +169,7 @@ public class EndpointCertificateMaintainerTest {
     void cert_pool_is_not_deleted() {
         EndpointCertificateProviderMock endpointCertificateProvider = (EndpointCertificateProviderMock) tester.controller().serviceRegistry().endpointCertificateProvider();
 
-        tester.flagSource().withIntFlag(Flags.CERT_POOL_SIZE.id(), 3);
+        tester.flagSource().withIntFlag(PermanentFlags.CERT_POOL_SIZE.id(), 3);
         assertEquals(0.0, certificatePoolMaintainer.maintain(), 0.0000001);
         assertEquals(0.0, maintainer.maintain(), 0.0000001);