From c60880a0af63b0c36028d0e9fee1b1ac8439e367 Mon Sep 17 00:00:00 2001
From: Ola Aunronning <olaa@yahooinc.com>
Date: Tue, 20 Dec 2022 14:29:26 +0100
Subject: Clean up tenant secrets

---
 .../hosted/controller/maintenance/TenantRoleCleanupMaintainer.java    | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'controller-server')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleCleanupMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleCleanupMaintainer.java
index b05a8c357fb..f29df1bc0d5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleCleanupMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleCleanupMaintainer.java
@@ -22,6 +22,10 @@ public class TenantRoleCleanupMaintainer extends ControllerMaintainer {
                 .toList();
         roleService.cleanupRoles(deletedTenants);
 
+        if (controller().system().isPublic()) {
+            controller().serviceRegistry().tenantSecretService().cleanupSecretStores(deletedTenants);
+        }
+
         return 1.0;
     }
 }
-- 
cgit v1.2.3