zheng1771 opened a new pull request, #14595:
URL: https://github.com/apache/cloudstack/pull/14595
### Description
Fixes: #14489
Deleting an externally managed Kubernetes cluster fails with NPE if its
VMs were already expunged.
The VM lookup returns null for expunged VMs, but the backup offering
check still tries to read them. Add a null check to skip missing VMs.
Existing VMs with a backup offering still block deletion.
To reproduce:
1. Create an externally managed Kubernetes cluster and attach VMs.
2. Destroy and expunge the attached VMs.
3. Delete the cluster with cleanup or expunge enabled.
Added four regression tests for missing VMs, mixed VM lists, and an
empty list.
<!--- Describe your changes in DETAIL - And how has behaviour functionally
changed. -->
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to
reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be
closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [ ] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [x] Major
- [ ] Minor
- [ ] Trivial
The error prevents deletion of affected clusters.
### Screenshots (if appropriate):
Not applicable.
### How Has This Been Tested?
Tested with OpenJDK 17 and Maven 3.8.7.
All 33 KubernetesClusterManagerImplTest tests passed, including the four
new regression tests. Required modules compiled and Maven checks passed.
Full project build and live-cloud testing were not run.
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to
-->
#### How did you try to break this feature and the system with this change?
Regression tests passed for:
- All mapped VMs missing.
- Missing VMs mixed with a VM without a backup offering.
- A missing VM followed by a VM with a backup offering. The check still
detects the backup offering and keeps the deletion restriction.
- An empty VM list.
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the
[CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
document -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
