From fb18a230443745670715e1bdc2298cfa023591e8 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 12 Jan 2026 13:07:16 +0100 Subject: [PATCH 1/2] CKS: fix NPE when remove a failed external node --- .../cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java | 2 +- 1 file 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 e6ed850fba58..709c9fcc8de9 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 @@ -2060,7 +2060,7 @@ public boolean deleteKubernetesCluster(DeleteKubernetesClusterCmd cmd) throws Cl public static boolean checkIfVmsAssociatedWithBackupOffering(List vms) { for(VMInstanceVO vm : vms) { - if (Objects.nonNull(vm.getBackupOfferingId())) { + if (ObjectUtils.allNotNull(vm, vm.getBackupOfferingId())) { return true; } } From e1667036925f707251d858e72170fa20507b01d4 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 14 Jan 2026 10:05:01 +0100 Subject: [PATCH 2/2] Update: still NPE when vm is null as it reads the value at first --- .../cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java | 2 +- 1 file 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 709c9fcc8de9..fc554ae9bcf4 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 @@ -2060,7 +2060,7 @@ public boolean deleteKubernetesCluster(DeleteKubernetesClusterCmd cmd) throws Cl public static boolean checkIfVmsAssociatedWithBackupOffering(List vms) { for(VMInstanceVO vm : vms) { - if (ObjectUtils.allNotNull(vm, vm.getBackupOfferingId())) { + if (vm != null && Objects.nonNull(vm.getBackupOfferingId())) { return true; } }