From 201e5639e95758efd6826e8ff0c45cde398b1409 Mon Sep 17 00:00:00 2001 From: Daman Arora Date: Wed, 7 Jan 2026 09:45:29 -0500 Subject: [PATCH] remove affinity group on cleanup in mcloud managed cks --- .../cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java | 1 - .../cluster/actionworkers/KubernetesClusterDestroyWorker.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java index 75e764c52fa..92518c43a61 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java @@ -2068,7 +2068,6 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne return Transaction.execute((TransactionCallback) status -> { kubernetesClusterDetailsDao.removeDetails(kubernetesClusterId); kubernetesClusterVmMapDao.removeByClusterId(kubernetesClusterId); - kubernetesClusterAffinityGroupMapDao.removeByClusterId(kubernetesClusterId); if (kubernetesClusterDao.remove(kubernetesClusterId)) { deleteProjectKubernetesAccountIfNeeded(cluster); return true; diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java index 62bd8b4576a..dc886117b22 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java @@ -348,6 +348,7 @@ public class KubernetesClusterDestroyWorker extends KubernetesClusterResourceMod 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);