summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-21 17:14:09 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-21 17:14:09 +0200
commit74785ca667c19e65fe31e6ca45cfdab9bc729988 (patch)
treed5ec86bed315cf93426330011d402e01ac6e1239 /flags
parent547da157c888f77da512f42585d6ede60153ee5b (diff)
Remove feature flags for ZK TLS
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java15
1 files changed, 0 insertions, 15 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 b3f7f42e308..ac47375473a 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -16,7 +16,6 @@ import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;
import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_ID;
import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_TYPE;
import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE;
import static com.yahoo.vespa.flags.FetchVector.Dimension.TENANT_ID;
import static com.yahoo.vespa.flags.FetchVector.Dimension.VESPA_VERSION;
import static com.yahoo.vespa.flags.FetchVector.Dimension.ZONE_ID;
@@ -109,20 +108,6 @@ public class Flags {
"Takes effect at redeployment",
ZONE_ID, APPLICATION_ID);
- public static final UnboundStringFlag TLS_FOR_ZOOKEEPER_CLIENT_SERVER_COMMUNICATION = defineStringFlag(
- "tls-for-zookeeper-client-server-communication", "TLS_WITH_PORT_UNIFICATION",
- List.of("hmusum"), "2020-12-02", "2021-06-01",
- "How to setup TLS for ZooKeeper client/server communication. Valid values are OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIFICATION, TLS_ONLY",
- "Takes effect on restart of config server",
- NODE_TYPE, HOSTNAME);
-
- public static final UnboundBooleanFlag USE_TLS_FOR_ZOOKEEPER_CLIENT = defineFeatureFlag(
- "use-tls-for-zookeeper-client", true,
- List.of("hmusum"), "2020-12-02", "2021-05-01",
- "Whether to use TLS for ZooKeeper clients",
- "Takes effect on restart of process",
- NODE_TYPE, HOSTNAME);
-
public static final UnboundBooleanFlag PROVISION_TENANT_ROLES = defineFeatureFlag(
"provision-tenant-roles", false,
List.of("tokle"), "2020-12-02", "2021-06-01",