From abc27941e92fd1c4740e0c857d0cad62c5dfcb39 Mon Sep 17 00:00:00 2001
From: Ola Aunrønning <olaa@verizonmedia.com>
Date: Thu, 11 Nov 2021 14:29:13 +0100
Subject: Delete unexpected roles

---
 .../hosted/controller/maintenance/UserManagementMaintainer.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
index 870e3af678f..5f6f917bc75 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
@@ -36,11 +36,8 @@ public class UserManagementMaintainer extends ControllerMaintainer {
     @Override
     protected double maintain() {
         findLeftoverRoles().forEach(role -> {
-            /*
-                Log discrepancy now
-                TODO: userManagement.deleteRole(role);
-             */
-            logger.warning(String.format("Found unexpected role %s - Please investigate", role.toString()));
+            logger.warning(String.format("Found unexpected %s - Deleting", role.toString()));
+            userManagement.deleteRole(role);
         });
         return 1.0;
     }
-- 
cgit v1.2.3