remove affinity group on cleanup in mcloud managed cks

Author: Daman Arora

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -2068,7 +2068,6 @@ public boolean deleteKubernetesCluster(DeleteKubernetesClusterCmd cmd) throws Cl
             return Transaction.execute((TransactionCallback<Boolean>) status -> {
                 kubernetesClusterDetailsDao.removeDetails(kubernetesClusterId);
                 kubernetesClusterVmMapDao.removeByClusterId(kubernetesClusterId);
-                kubernetesClusterAffinityGroupMapDao.removeByClusterId(kubernetesClusterId);
                 if (kubernetesClusterDao.remove(kubernetesClusterId)) {
                     deleteProjectKubernetesAccountIfNeeded(cluster);
                     return true;

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java

@@ -348,6 +348,7 @@ public boolean destroy() throws CloudRuntimeException {
         stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
         annotationDao.removeByEntityType(AnnotationService.EntityType.KUBERNETES_CLUSTER.name(), kubernetesCluster.getUuid());
         kubernetesClusterDetailsDao.removeDetails(kubernetesCluster.getId());
+        kubernetesClusterAffinityGroupMapDao.removeByClusterId(kubernetesCluster.getId());
         boolean deleted = kubernetesClusterDao.remove(kubernetesCluster.getId());
         if (!deleted) {
             logMessage(Level.WARN, String.format("Failed to delete Kubernetes cluster: %s", kubernetesCluster), null);