Skip to content

Fix Kubernetes cluster deletion with expunged nodes #14595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zheng1771 wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+31 −1
Open

Fix Kubernetes cluster deletion with expunged nodes #14595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...etes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@ public boolean deleteKubernetesCluster(DeleteKubernetesClusterCmd cmd) throws Cl

public static boolean checkIfVmsAssociatedWithBackupOffering(List<VMInstanceVO> vms) {
for(VMInstanceVO vm : vms) {
if (Objects.nonNull(vm.getBackupOfferingId())) {
if (Objects.nonNull(vm) && Objects.nonNull(vm.getBackupOfferingId())) {
return true;
}
}
Expand Down
30 changes: 30 additions & 0 deletions ...-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,36 @@ public class KubernetesClusterManagerImplTest {
@InjectMocks
KubernetesClusterManagerImpl kubernetesClusterManager;

@Test
public void testCheckBackupOfferingWithOnlyMissingVms() {
Assert.assertFalse(KubernetesClusterManagerImpl.checkIfVmsAssociatedWithBackupOffering(
Arrays.asList(null, null)));
}

@Test
public void testCheckBackupOfferingWithMissingAndUnassociatedVms() {
VMInstanceVO vm = Mockito.mock(VMInstanceVO.class);
Mockito.when(vm.getBackupOfferingId()).thenReturn(null);

Assert.assertFalse(KubernetesClusterManagerImpl.checkIfVmsAssociatedWithBackupOffering(
Arrays.asList(null, vm, null)));
}

@Test
public void testCheckBackupOfferingWithMissingAndAssociatedVms() {
VMInstanceVO vm = Mockito.mock(VMInstanceVO.class);
Mockito.when(vm.getBackupOfferingId()).thenReturn(1L);

Assert.assertTrue(KubernetesClusterManagerImpl.checkIfVmsAssociatedWithBackupOffering(
Arrays.asList(null, vm)));
}

@Test
public void testCheckBackupOfferingWithNoVms() {
Assert.assertFalse(KubernetesClusterManagerImpl.checkIfVmsAssociatedWithBackupOffering(
Collections.emptyList()));
}

@Test
public void testValidateVpcTierAllocated() {
Network network = Mockito.mock(Network.class);
Expand Down