summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2021-02-02 15:49:33 +0100
committerOla Aunrønning <olaa@verizonmedia.com>2021-02-02 15:49:33 +0100
commit960022afa54672c004f37539452b6f68301a31a4 (patch)
treee3194d442b711a84d345bb59a93130a8a9f6c9f0 /flags
parent1da28a5c15fc0d78f461c6466ea83e774a996e4d (diff)
Change application IAM role flags to tenant IAM role flags
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java18
1 files changed, 7 insertions, 11 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 e216fc131eb..3a67ca3c374 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -12,11 +12,7 @@ import java.util.List;
import java.util.Optional;
import java.util.TreeMap;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;
-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.VESPA_VERSION;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.ZONE_ID;
+import static com.yahoo.vespa.flags.FetchVector.Dimension.*;
/**
* Definitions of feature flags.
@@ -178,19 +174,19 @@ public class Flags {
"Whether to provision and use endpoint certs for apps in shared routing zones",
"Takes effect on next deployment of the application", APPLICATION_ID);
- public static final UnboundBooleanFlag PROVISION_APPLICATION_ROLES = defineFeatureFlag(
+ public static final UnboundBooleanFlag PROVISION_TENANT_ROLES = defineFeatureFlag(
"provision-application-roles", false,
- List.of("tokle"), "2020-12-02", "2021-02-01",
+ List.of("tokle"), "2020-12-02", "2021-08-01",
"Whether application roles should be provisioned",
"Takes effect on next deployment (controller)",
- ZONE_ID);
+ TENANT_ID);
- public static final UnboundBooleanFlag APPLICATION_IAM_ROLE = defineFeatureFlag(
+ public static final UnboundBooleanFlag TENANT_IAM_ROLE = defineFeatureFlag(
"application-iam-roles", false,
- List.of("tokle"), "2020-12-02", "2021-02-01",
+ List.of("tokle"), "2020-12-02", "2021-08-01",
"Allow separate iam roles when provisioning/assigning hosts",
"Takes effect immediately on new hosts, on next redeploy for applications",
- APPLICATION_ID);
+ TENANT_ID);
public static final UnboundIntFlag MAX_TRIAL_TENANTS = defineIntFlag(
"max-trial-tenants", -1,