From aacea02fa2b6be7d2d73fb620eb4392131937e5d Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 2 Apr 2020 14:58:02 +0200 Subject: Remove feature flag for using new Athenz filter --- .../src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 +- .../main/java/com/yahoo/config/model/deploy/TestProperties.java | 7 ------- .../com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 5 +---- flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 ------ 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 4b9fd7db27e..b40f1fed131 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -67,7 +67,7 @@ public interface ModelContext { default Optional endpointCertificateSecrets() { return Optional.empty(); } double defaultTermwiseLimit(); boolean useBucketSpaceMetric(); - default boolean useNewAthenzFilter() { return false; } + default boolean useNewAthenzFilter() { return true; } // TODO bjorncs: Remove after end of April // TODO: Remove after April 2020 default boolean usePhraseSegmenting() { return false; } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 896c6ea9a7f..c2f1e399e08 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -42,7 +42,6 @@ public class TestProperties implements ModelContext.Properties { private boolean useAdaptiveDispatch = false; private double defaultTermwiseLimit = 1.0; private Optional endpointCertificateSecrets = Optional.empty(); - private boolean useNewAthenzFilter = false; private AthenzDomain athenzDomain; @Override public boolean multitenant() { return multitenant; } @@ -63,7 +62,6 @@ public class TestProperties implements ModelContext.Properties { @Override public Optional tlsSecrets() { return endpointCertificateSecrets.map(TlsSecrets::new); } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } @Override public boolean useBucketSpaceMetric() { return true; } - @Override public boolean useNewAthenzFilter() { return useNewAthenzFilter; } @Override public boolean useDedicatedNodesWhenUnspecified() { return true; } @Override public Optional athenzDomain() { return Optional.ofNullable(athenzDomain); } @@ -107,11 +105,6 @@ public class TestProperties implements ModelContext.Properties { return this; } - public TestProperties setUseNewAthenzFilter(boolean useNewAthenzFilter) { - this.useNewAthenzFilter = useNewAthenzFilter; - return this; - } - public TestProperties setZone(Zone zone) { this.zone = zone; return this; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 7bfbf5f4e06..bb38d62895b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -142,7 +142,6 @@ public class ModelContextImpl implements ModelContext { private final Optional endpointCertificateSecrets; private final double defaultTermwiseLimit; private final boolean useBucketSpaceMetric; - private final boolean useNewAthenzFilter; private final String proxyProtocol; private final Optional athenzDomain; private final boolean useDedicatedNodesWhenUnspecified; @@ -179,8 +178,6 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.useBucketSpaceMetric = Flags.USE_BUCKET_SPACE_METRIC.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - this.useNewAthenzFilter = Flags.USE_NEW_ATHENZ_FILTER.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.proxyProtocol = Flags.PROXY_PROTOCOL.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.athenzDomain = athenzDomain; @@ -241,7 +238,7 @@ public class ModelContextImpl implements ModelContext { public boolean useBucketSpaceMetric() { return useBucketSpaceMetric; } @Override - public boolean useNewAthenzFilter() { return useNewAthenzFilter; } + public boolean useNewAthenzFilter() { return true; } @Override public String proxyProtocol() { return proxyProtocol; } 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 862d83461fd..913407a7c5d 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -216,12 +216,6 @@ public class Flags { "Whether the endpoint certificate maintainer should backfill missing certificate data from cameo", "Takes effect on next scheduled run of maintainer - set to \"disable\", \"dryrun\" or \"enable\""); - public static final UnboundBooleanFlag USE_NEW_ATHENZ_FILTER = defineFeatureFlag( - "use-new-athenz-filter", false, - "Use new Athenz filter that supports access-tokens", - "Takes effect at redeployment", - APPLICATION_ID); - public static final UnboundStringFlag DOCKER_IMAGE_REPO = defineStringFlag( "docker-image-repo", "", "Override default docker image repo. Docker image version will be Vespa version.", -- cgit v1.2.3