Remove regional-container-registry flag

3 files changed, 10 insertions, 16 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 03ff89d36dc..86795767710 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -165,7 +165,7 @@ public class NodeRepository extends AbstractComponent {
         this.osVersions = new OsVersions(this);
         this.infrastructureVersions = new InfrastructureVersions(db);
         this.firmwareChecks = new FirmwareChecks(db, clock);
-        this.containerImages = new ContainerImages(db, containerImage, flagSource);
+        this.containerImages = new ContainerImages(db, containerImage);
         this.jobControl = new JobControl(new JobControlFlags(db, flagSource));
         this.applications = new Applications(db);
         this.spareCount = spareCount;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
index 45156c57481..b4cb9158a5c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
@@ -6,9 +6,6 @@ import com.google.common.base.Suppliers;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.curator.Lock;
-import com.yahoo.vespa.flags.BooleanFlag;
-import com.yahoo.vespa.flags.FlagSource;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.hosted.provision.persistence.CuratorDatabaseClient;
 
 import java.time.Duration;
@@ -31,7 +28,6 @@ public class ContainerImages {
 
     private final CuratorDatabaseClient db;
     private final DockerImage defaultImage;
-    private final BooleanFlag replaceImage;
 
     /**
      * The container image is read on every request to /nodes/v2/node/[fqdn]. Cache current images to avoid
@@ -40,10 +36,9 @@ public class ContainerImages {
      */
     private volatile Supplier<Map<NodeType, DockerImage>> images;
 
-    public ContainerImages(CuratorDatabaseClient db, DockerImage defaultImage, FlagSource flagSource) {
+    public ContainerImages(CuratorDatabaseClient db, DockerImage defaultImage) {
         this.db = db;
         this.defaultImage = defaultImage;
-        this.replaceImage = Flags.REGIONAL_CONTAINER_REGISTRY.bindTo(flagSource);
         createCache();
     }
 
@@ -85,7 +80,7 @@ public class ContainerImages {
     /** Rewrite the registry part of given image, using this zone's default image */
     private DockerImage rewriteRegistry(DockerImage image) {
         DockerImage zoneImage = defaultImage;
-        if (zoneImage.replacedBy().isPresent() && replaceImage.value()) {
+        if (zoneImage.replacedBy().isPresent()) {
             zoneImage = zoneImage.replacedBy().get();
         }
         return image.withRegistry(zoneImage.registry());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java
index d02244b7e11..9d390697df5 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import org.junit.Test;
 
@@ -52,22 +51,22 @@ public class ContainerImagesTest {
     @Test
     public void image_replacement() {
         var flagSource = new InMemoryFlagSource();
-        var defaultImage = DockerImage.fromString("foo.example.com/vespa/vespa")
-                                      .withReplacedBy(DockerImage.fromString("bar.example.com/vespa/vespa"));
+        var defaultImage = DockerImage.fromString("foo.example.com/vespa/vespa");
         var tester = new ProvisioningTester.Builder().defaultImage(defaultImage).flagSource(flagSource).build();
         var hosts = tester.makeReadyNodes(2, "default", NodeType.host);
         tester.activateTenantHosts();
 
-        // Default image is used with flag disabled
-        flagSource.withBooleanFlag(Flags.REGIONAL_CONTAINER_REGISTRY.id(), false);
+        // Default image is used when there is no replacement
         for (var host : hosts) {
             assertEquals(defaultImage, tester.nodeRepository().containerImages().imageFor(host.type()));
         }
 
-        // Enabling flag switches to replacement
-        flagSource.withBooleanFlag(Flags.REGIONAL_CONTAINER_REGISTRY.id(), true);
+        // Replacement image is preferred
+        DockerImage imageWithReplacement = defaultImage.withReplacedBy(DockerImage.fromString("bar.example.com/vespa/vespa"));
+        tester = new ProvisioningTester.Builder().defaultImage(imageWithReplacement).flagSource(flagSource).build();
+        hosts = tester.makeReadyNodes(2, "default", NodeType.host);
         for (var host : hosts) {
-            assertEquals(defaultImage.replacedBy().get().asString(),
+            assertEquals(imageWithReplacement.replacedBy().get().asString(),
                          tester.nodeRepository().containerImages().imageFor(host.type()).asString());
         }
     }