Remove 'nginx-upstream-proxy-protocol' feature flag

3 files changed, 0 insertions, 14 deletions

diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def
index cc496a99c20..33c568061fe 100644
--- a/configdefinitions/src/vespa/lb-services.def
+++ b/configdefinitions/src/vespa/lb-services.def
@@ -4,9 +4,6 @@
 
 namespace=cloud.config
 
-# Enable proxy-protocol for nginx upstreams
-nginxUpstreamProxyProtocol                                      bool default=false
-
 # Active rotation given as flag 'active' for a prod region in deployment.xml
 # Default true for now (since code in config-model to set it is not ready yet), should have no default value
 tenants{}.applications{}.activeRotation                         bool default=true
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
index 4fe2ec129d3..6366576e163 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
@@ -9,9 +9,7 @@ import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.vespa.flags.BooleanFlag;
 import com.yahoo.vespa.flags.FlagSource;
-import com.yahoo.vespa.flags.Flags;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -34,17 +32,14 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
 
     private final Map<TenantName, Set<ApplicationInfo>> models;
     private final Zone zone;
-    private final BooleanFlag nginxUpstreamProxyProtocol;
 
     public LbServicesProducer(Map<TenantName, Set<ApplicationInfo>> models, Zone zone, FlagSource flagSource) {
         this.models = models;
         this.zone = zone;
-        this.nginxUpstreamProxyProtocol = Flags.NGINX_UPSTREAM_PROXY_PROTOCOL.bindTo(flagSource);
     }
 
     @Override
     public void getConfig(LbServicesConfig.Builder builder) {
-        builder.nginxUpstreamProxyProtocol(nginxUpstreamProxyProtocol.value());
         models.keySet().stream()
                 .sorted()
                 .forEach(tenant -> {
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 85d841e4bb0..22b5ce419d6 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -247,12 +247,6 @@ public class Flags {
             "Takes effect immediately",
             APPLICATION_ID);
 
-    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",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundBooleanFlag NLB_PROXY_PROTOCOL = defineFeatureFlag(
             "nlb-proxy-protocol", false,
             "Configure NLB to use proxy protocol",