diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2019-01-15 13:19:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 13:19:22 +0100 |
| commit | 8a2d36aa9a49591d83600f5ed98fdee2272be36a (patch) | |
| tree | 861a0122b6412b46dfe699f503636bff5b3a52b8 /flags | |
| parent | 3574b0c1c4dbf465089d4f574779174a2fb4b398 (diff) | |
| parent | d930e2d8a256b2f248205d3cc398eb186a435f04 (diff) | |
Merge pull request #8150 from vespa-engine/bjorncs/vespa-tls-feature-flags
Introduce feature flags for the "tls-insecure" configuration
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 13 |
1 files changed, 13 insertions, 0 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 9a4f1faed03..ef0075856ca 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -10,6 +10,7 @@ import java.util.TreeMap; import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME; +import static com.yahoo.vespa.flags.FetchVector.Dimension.ZONE_ID; /** * @author hakonhall @@ -57,6 +58,18 @@ public class Flags { "Takes effect on next node agent tick. Change is orchestrated, but does NOT require container restart", HOSTNAME, APPLICATION_ID); + public static final UnboundStringFlag TLS_INSECURE_MIXED_MODE = defineStringFlag( + "tls-insecure-mixed-mode", "plaintext_client_mixed_server", + "TLS insecure mixed mode. Allowed values: ['plaintext_client_mixed_server', 'tls_client_mixed_server', 'tls_client_tls_server']", + "Takes effect on restart of Docker container", + ZONE_ID, APPLICATION_ID, HOSTNAME); + + public static final UnboundStringFlag TLS_INSECURE_AUTHORIZATION_MODE = defineStringFlag( + "tls-insecure-authorization-mode", "log_only", + "TLS insecure authorization mode. Allowed values: ['disable', 'log_only', 'enforce']", + "Takes effect on restart of Docker container", + ZONE_ID, APPLICATION_ID, HOSTNAME); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, String modificationEffect, FetchVector.Dimension... dimensions) { |