summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2021-11-01 16:36:52 +0100
committerGitHub <noreply@github.com>2021-11-01 16:36:52 +0100
commit1fe33b4e407a463d5f721b2ebaed005e4462f147 (patch)
tree5f0ca8e3584c370fd1f8f94758349e60d4554571
parenteab021943490010c68d2ae08698f8ec7cac4b308 (diff)
parentf39a6bf2101241ed18812878535d585d6b9d496f (diff)
Merge pull request #19817 from vespa-engine/hakonhall/remove-force-disk-encryption-max-encrypting-hosts-and-defer-application-encryption
Remove force-disk-encryption, max-encrypting-hosts, and defer-application-encryption
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java18
1 files changed, 0 insertions, 18 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 18c2e794994..769e698b622 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -45,12 +45,6 @@ public class Flags {
private static volatile TreeMap<FlagId, FlagDefinition> flags = new TreeMap<>();
- public static final UnboundBooleanFlag FORCE_DISK_ENCRYPTION = defineFeatureFlag(
- "force-disk-encryption", true,
- List.of("hakonhall"), "2021-10-01", "2021-11-01",
- "Enable new conditions for when to encrypt disk.",
- "Takes effect on next host admin tick.");
-
public static final UnboundBooleanFlag MAP_USER_NAMESPACE = defineFeatureFlag(
"map-user-namespace", false,
List.of("freva"), "2021-10-18", "2021-12-01",
@@ -248,18 +242,6 @@ public class Flags {
"Takes effect on next internal redeployment",
APPLICATION_ID);
- public static final UnboundIntFlag MAX_ENCRYPTING_HOSTS = defineIntFlag(
- "max-encrypting-hosts", 0,
- List.of("mpolden", "hakonhall"), "2021-05-27", "2021-11-01",
- "The maximum number of hosts allowed to encrypt their disk concurrently",
- "Takes effect on next run of HostEncrypter, but any currently encrypting hosts will not be cancelled when reducing the limit");
-
- public static final UnboundListFlag<String> DEFER_APPLICATION_ENCRYPTION = defineListFlag(
- "defer-application-encryption", List.of(), String.class,
- List.of("mpolden", "hakonhall"), "2021-06-23", "2021-11-01",
- "List of applications where encryption of their host should be deferred",
- "Takes effect on next run of HostEncrypter");
-
public static final UnboundDoubleFlag MIN_NODE_RATIO_PER_GROUP = defineDoubleFlag(
"min-node-ratio-per-group", 0.0,
List.of("geirst", "vekterli"), "2021-07-16", "2021-12-01",