zheng1771 opened a new pull request, #14613: URL: https://github.com/apache/cloudstack/pull/14613
### Description Fixes: #14504 When a Kubernetes cluster uses the default compute offering, its control and worker node offering IDs are left empty. Only explicit per-node offerings are saved. Save the effective offering ID for control and worker nodes when creating the cluster. Also save it for separate etcd nodes when present. Use the default offering if no per-node offering is supplied, and keep explicit overrides. Existing cluster records are not changed. To reproduce: 1. Create a Kubernetes cluster with a default compute offering. 2. Leave the per-node offerings unset in advanced settings. 3. Check the control and worker offering IDs in the cluster record. The IDs should contain the selected default offering instead of null. <!--- 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 Missing node offering IDs can affect later cluster scaling. ### Screenshots (if appropriate): Not applicable. Backend change. ### How Has This Been Tested? Tested with OpenJDK 17 and Maven 3.8.7. All 37 tests in KubernetesClusterManagerImplTest and KubernetesClusterScaleWorkerTest passed, including four new regression tests. Required modules compiled and Checkstyle 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? Added tests for: - A default offering without per-node overrides. - A worker override with default control and etcd offerings. - Explicit offerings for all node types without a default offering. - An etcd offering supplied when there are no separate etcd nodes. The default-only and partial-override tests failed with the original storage behavior and passed after the change. Explicit offerings are preserved, and no etcd offering is saved when separate etcd nodes are absent. <!-- 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]
