diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2021-09-22 11:48:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 11:48:08 +0200 |
| commit | 2836d57d3983fa8d0ec11cef8207485b7265bfcd (patch) | |
| tree | 4914cd5bf13f25dd269dddce35af817fee75983e /flags | |
| parent | a00203c5f216d3a5c06a3a3ce8c2f6d3b8e4716c (diff) | |
make ENDPOINT_CERTIFICATE_ALGORITHM flag permanent (#19240)
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 8 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java | 7 |
2 files changed, 7 insertions, 8 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 2e05bbf5d90..015e063fe11 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -297,14 +297,6 @@ public class Flags { APPLICATION_ID ); - public static final UnboundStringFlag ENDPOINT_CERTIFICATE_ALGORITHM = defineStringFlag( - "endpoint-certificate-algorithm", "", - // Acceptable values are: "rsa_2048", "rsa_4096", "ecdsa_p256" - List.of("andreer"), "2021-09-21", "2022-01-01", - "Selects algorithm used for an applications endpoint certificate, or use provider default if blank", - "Takes effect when a new endpoint certificate is requested (first deployment of new application/instance)", - APPLICATION_ID); - /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners, String createdAt, String expiresAt, String description, 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 da2f8d7783f..cdce5b03fea 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -169,6 +169,13 @@ public class PermanentFlags { APPLICATION_ID ); + public static final UnboundStringFlag ENDPOINT_CERTIFICATE_ALGORITHM = defineStringFlag( + "endpoint-certificate-algorithm", "", + // Acceptable values are: "rsa_2048", "rsa_4096", "ecdsa_p256" + "Selects algorithm used for an applications endpoint certificate, or use provider default if blank", + "Takes effect when a new endpoint certificate is requested (first deployment of new application/instance)", + APPLICATION_ID); + public static final UnboundDoubleFlag RESOURCE_LIMIT_DISK = defineDoubleFlag( "resource-limit-disk", 0.8, "Resource limit (between 0.0 and 1.0) for disk used by cluster controller for when to block feed", |