diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-04-22 10:47:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 10:47:12 +0200 |
| commit | 77ea48a22d357f67e90048072ec10fe72be21474 (patch) | |
| tree | 878c0d418fdb919f960fbdcf49d4bee5fad2ad26 | |
| parent | 5f15b0c28c8cd516cabac43e761f6a431494ab48 (diff) | |
| parent | 68762b3f1dfbf94063f8206a281e6eab5b055274 (diff) | |
Merge pull request #13005 from vespa-engine/mortent/nlb-proxy-protocol
Create flag for rolling out nlb proxy protocol
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 9 |
1 files changed, 8 insertions, 1 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 779d4e80056..76206996207 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -241,7 +241,14 @@ public class Flags { public static final UnboundBooleanFlag NGINX_UPSTREAM_PROXY_PROTOCOL = defineFeatureFlag( "nginx-upstream-proxy-protocol", false, "Whether the nginx should enable proxy-protocol for all upstreams", - "Takes effect immediately"); + "Takes effect immediately", + ZONE_ID, APPLICATION_ID); + + public static final UnboundBooleanFlag NLB_PROXY_PROTOCOL = defineFeatureFlag( + "nlb-proxy-protocol", false, + "Configure NLB to use proxy protocol", + "Takes effect on next application redeploy", + APPLICATION_ID); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, |