diff options
author | Martin Polden <mpolden@mpolden.no> | 2024-02-09 13:33:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 13:33:08 +0100 |
commit | 097d6e69ba67f0d06b285148c6cc64cb39d788be (patch) | |
tree | f912f5e64199f37f75e3c91247afc61c5dd592d8 /flags | |
parent | de853a8bc9eae539f4e6f430c684165682fb67e9 (diff) | |
parent | 03efcfa51329278050cfdb698fead37cf5258367 (diff) |
Merge pull request #30230 from vespa-engine/mpolden/add-dimension
Add certificate-provider dimension
Diffstat (limited to 'flags')
3 files changed, 8 insertions, 3 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java b/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java index 0f81fd4640b..328d581aed3 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Dimension.java @@ -35,6 +35,9 @@ public enum Dimension { /** Machine architecture: either arm64 or x86_64. */ ARCHITECTURE("architecture"), + /** A provider of TLS certificates. */ + CERTIFICATE_PROVIDER("certificate-provider"), + /** Whether "enclave" (or "inclave" or "exclave"), or not ("noclave"). */ CLAVE("clave"), 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 4edda472531..05f2062136b 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -14,6 +14,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import static com.yahoo.vespa.flags.Dimension.APPLICATION; +import static com.yahoo.vespa.flags.Dimension.CERTIFICATE_PROVIDER; import static com.yahoo.vespa.flags.Dimension.CLOUD_ACCOUNT; import static com.yahoo.vespa.flags.Dimension.INSTANCE_ID; import static com.yahoo.vespa.flags.Dimension.CLUSTER_ID; @@ -418,7 +419,8 @@ public class PermanentFlags { public static final UnboundIntFlag CERT_POOL_SIZE = defineIntFlag( "cert-pool-size", 0, "Target number of preprovisioned endpoints certificates to maintain", - "Takes effect on next run of CertPoolMaintainer" + "Takes effect on next run of CertificatePoolMaintainer", + CERTIFICATE_PROVIDER ); public static final UnboundBooleanFlag ENCLAVE_WITHOUT_WIREGUARD = defineFeatureFlag( diff --git a/flags/src/test/java/com/yahoo/vespa/flags/DimensionTest.java b/flags/src/test/java/com/yahoo/vespa/flags/DimensionTest.java index 4b64c8a198e..032874dffac 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/DimensionTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/DimensionTest.java @@ -12,9 +12,9 @@ class DimensionTest { @SuppressWarnings("unused") public String remember_to_update_SystemFlagsDataArchive(Dimension dimension) { return switch (dimension) { - case APPLICATION, ARCHITECTURE, CLAVE, CLOUD, CLOUD_ACCOUNT, CLUSTER_ID, CLUSTER_TYPE, + case APPLICATION, ARCHITECTURE, CERTIFICATE_PROVIDER, CLAVE, CLOUD, CLOUD_ACCOUNT, CLUSTER_ID, CLUSTER_TYPE, CONSOLE_USER_EMAIL, ENVIRONMENT, HOSTNAME, INSTANCE_ID, NODE_TYPE, SYSTEM, TENANT_ID, VESPA_VERSION, ZONE_ID -> dimension.toWire(); }; } -}
\ No newline at end of file +} |