Remove use of flags for tenant specific iam roles

1 files changed, 2 insertions, 8 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 45297d64781..c1750c73c2b 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -107,16 +107,10 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag PROVISION_TENANT_ROLES = defineFeatureFlag(
-            "provision-tenant-roles", false,
-            List.of("tokle"), "2020-12-02", "2021-06-01",
-            "Whether tenant roles should be provisioned",
-            "Takes effect on next deployment (controller)",
-            TENANT_ID);
-
+    // TODO: Remove when models referring to this are gone in all systems
     public static final UnboundBooleanFlag TENANT_IAM_ROLE = defineFeatureFlag(
             "application-iam-roles", false,
-            List.of("tokle"), "2020-12-02", "2021-06-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",
             TENANT_ID);