aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2023-05-24 10:52:37 +0200
committerGitHub <noreply@github.com>2023-05-24 10:52:37 +0200
commitd4f477a4d7fc89cad395fae0d2a5180972d14ed4 (patch)
tree290fe7be1a2bf9758811e7cc0c9f2e4cd035c39f
parent701b8d2820090c6e70f501ff316e8696c86fc88d (diff)
parent1fc30ffa86eedff6268d9c9796824a9008eb1db8 (diff)
Merge pull request #27198 from vespa-engine/hmusum/validate-flag-values
Specify valid values for ADMIN_CLUSTER_NODE_ARCHITECTURE
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
index e80348261ef..452267e73e7 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -9,6 +9,7 @@ import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Set;
import java.util.function.Predicate;
import java.util.regex.Pattern;
@@ -304,8 +305,9 @@ public class PermanentFlags {
public static final UnboundStringFlag ADMIN_CLUSTER_NODE_ARCHITECTURE = defineStringFlag(
"admin-cluster-node-architecture", "x86_64",
"Architecture to use for node resources. Used when implicitly creating admin clusters " +
- "(logserver, clustercontroller). Valid values: x86_64, arm64",
+ "(logserver and clustercontroller clusters).",
"Takes effect on next redeployment",
+ value -> Set.of("any", "arm64", "x86_64").contains(value),
ZONE_ID, APPLICATION_ID);
public static final UnboundListFlag<String> CLOUD_ACCOUNTS = defineListFlag(