Merge pull request #21677 from vespa-engine/mortent/create-roles-all-tenants

Create roles for all tenants

1 files changed, 0 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
index 7c6decb4a93..dad836ca2de 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
@@ -29,11 +29,8 @@ public class TenantRoleMaintainer extends ControllerMaintainer {
         // Create separate athenz service for all tenants
         tenants.forEach(roleService::createTenantRole);
 
-        // Until we have moved to separate athenz service per tenant, make sure we update the shared policy
-        // to allow ssh logins for hosts in prod/perf with a separate tenant iam role.
         var tenantsWithRoles = tenants.stream()
                 .map(Tenant::name)
-                .filter(tenant -> hasProductionDeployment(tenant) || hasPerfDeployment(tenant))
                 .collect(Collectors.toList());
         roleService.maintainRoles(tenantsWithRoles);
         return 1.0;