diff options
3 files changed, 12 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java index 9050ab4ef65..30a35288f9f 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java @@ -3,6 +3,8 @@ package com.yahoo.vespa.hosted.controller.api.integration.secrets; import com.yahoo.config.provision.TenantName; +import java.util.List; + /** * @author olaa */ @@ -14,4 +16,6 @@ public class NoopTenantSecretService implements TenantSecretService { @Override public void deleteSecretStore(TenantName tenant, TenantSecretStore tenantSecretStore) {} + @Override + public void cleanupSecretStores(List<TenantName> deletedTenants) {} } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java index b85e435a0db..b081a542b2e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java @@ -3,6 +3,8 @@ package com.yahoo.vespa.hosted.controller.api.integration.secrets; import com.yahoo.config.provision.TenantName; +import java.util.List; + /** * @author olaa */ @@ -12,4 +14,6 @@ public interface TenantSecretService { void deleteSecretStore(TenantName tenant, TenantSecretStore tenantSecretStore); + void cleanupSecretStores(List<TenantName> deletedTenants); + } 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; } } |