diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-11-16 15:02:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 15:02:13 +0100 |
| commit | 1e137f89239f667c674e36dbd45a075e01ef1e3e (patch) | |
| tree | ceab4e0213e135c43c2b07593329e8959d771350 | |
| parent | f5ae3ada6caec02f2dd6c883d422f0b495f76b92 (diff) | |
| parent | 861ba556e04e45123d60e211dbeaf79f1aae0ae5 (diff) | |
Merge pull request #15354 from vespa-engine/mpolden/change-flag-default
Enable regional-container-registry by default
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 4 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImagesTest.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 6a831cb67d5..cd60a082472 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -332,9 +332,9 @@ public class Flags { public static final UnboundBooleanFlag REGIONAL_CONTAINER_REGISTRY = defineFeatureFlag( "regional-container-registry", - false, + true, "Whether host-admin should download images from the zone's regional container registry", - "Takes effect on host-admin restart"); + "Takes effect immediately"); public static final UnboundBooleanFlag ENABLE_AUTOMATIC_REINDEXING = defineFeatureFlag( "enable-automatic-reindexing", 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 94b670f8e5e..d02244b7e11 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 @@ -58,7 +58,8 @@ public class ContainerImagesTest { var hosts = tester.makeReadyNodes(2, "default", NodeType.host); tester.activateTenantHosts(); - // Default image is used initially + // Default image is used with flag disabled + flagSource.withBooleanFlag(Flags.REGIONAL_CONTAINER_REGISTRY.id(), false); for (var host : hosts) { assertEquals(defaultImage, tester.nodeRepository().containerImages().imageFor(host.type())); } |