fix no bean found

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -85,6 +85,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.auth.SetupUserTwoFactorAuthenticationCmd;
@@ -172,6 +173,7 @@
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.component.PluggableService;
@@ -302,8 +304,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
     private UserDataDao userDataDao;
     @Inject
     private NetworkPermissionDao networkPermissionDao;
-    @Inject
-    KubernetesServiceHelper kubernetesServiceHelper;
 
     private List<QuerySelector> _querySelectors;
 
@@ -851,6 +851,16 @@ public boolean deleteAccount(AccountVO account, long callerUserId, Account calle
         return cleanupAccount(account, callerUserId, caller);
     }
 
+    protected void cleanupPluginsResourcesIfNeeded(Account account) {
+        try {
+            KubernetesServiceHelper kubernetesServiceHelper =
+                    ComponentContext.getDelegateComponentOfType(KubernetesServiceHelper.class);
+            kubernetesServiceHelper.cleanupForAccount(account);
+        } catch (NoSuchBeanDefinitionException ignored) {
+            s_logger.debug("No KubernetesServiceHelper bean found");
+        }
+    }
+
     protected boolean cleanupAccount(AccountVO account, long callerUserId, Account caller) {
         long accountId = account.getId();
         boolean accountCleanupNeeded = false;
@@ -932,7 +942,7 @@ protected boolean cleanupAccount(AccountVO account, long callerUserId, Account c
                 }
             }
 
-            kubernetesServiceHelper.cleanupForAccount(account);
+            cleanupPluginsResourcesIfNeeded(account);
 
             // Destroy the account's VMs
             List<UserVmVO> vms = _userVmDao.listByAccountId(accountId);

server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java

@@ -24,7 +24,6 @@
 import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.event.dao.UsageEventDao;
-import com.cloud.kubernetes.cluster.KubernetesServiceHelper;
 import com.cloud.network.as.AutoScaleManager;
 import com.cloud.network.dao.AccountGuestVlanMapDao;
 import com.cloud.network.dao.IPAddressDao;
@@ -199,8 +198,6 @@ public class AccountManagetImplTestBase {
     UserDataDao userDataDao;
     @Mock
     NetworkPermissionDao networkPermissionDaoMock;
-    @Mock
-    KubernetesServiceHelper kubernetesServiceHelper;
 
     @Spy
     @InjectMocks