[4.22] Prevent unmanaging or recovering a VM if it is part of a CKS cluster by nvazquez · Pull Request #12800 · apache/cloudstack

nvazquez · 2026-03-12T10:43:30Z

Description

This PR prevents unmanaging or recovering a VM if it belongs to a CKS cluster, with a descriptive message

Fixes: #12783
Fixes: #12837

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
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

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2026-03-12T10:53:11Z

Codecov Report

❌ Patch coverage is 28.57143% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.61%. Comparing base (09ee092) to head (48073b3).
⚠️ Report is 1 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java	0.00%	5 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.22   #12800   +/-   ##
=========================================
  Coverage     17.61%   17.61%           
- Complexity    15661    15668    +7     
=========================================
  Files          5917     5917           
  Lines        531423   531437   +14     
  Branches      64973    64975    +2     
=========================================
+ Hits          93586    93607   +21     
+ Misses       427280   427272    -8     
- Partials      10557    10558    +1

Flag	Coverage Δ
uitests	`3.70% <ø> (ø)`
unittests	`18.68% <28.57%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

sureshanaparti

clgtm

nvazquez · 2026-03-12T12:49:19Z

@blueorangutan package

blueorangutan · 2026-03-12T12:50:04Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

DaanHoogland

clgtm

blueorangutan · 2026-03-12T14:02:44Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17119

nvazquez · 2026-03-12T14:03:42Z

@blueorangutan test

blueorangutan · 2026-03-12T14:06:03Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-03-12T15:17:51Z

[SF] Trillian Build Failed (tid-15632)

nvazquez · 2026-03-12T15:19:47Z

@blueorangutan test

blueorangutan · 2026-03-12T15:22:04Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-03-12T16:30:53Z

[SF] Trillian Build Failed (tid-15633)

kiranchavala · 2026-03-13T09:50:08Z

@blueorangutan test

blueorangutan · 2026-03-17T04:34:04Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-03-17T05:32:08Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17168

kiranchavala · 2026-03-17T05:40:57Z

@blueorangutan test

blueorangutan · 2026-03-17T05:42:04Z

@kiranchavala a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

kiranchavala

@nvazquez Please provide proper error message when a end user unamanges a instance which is a part of a cks cluster

(localcloud) 🐱 > unmanage virtualmachine id=0aa8147a-1002-49e9-bcc6-5af4b35f05d2
{
  "account": "admin",
  "accountid": "7f089b6c-21c6-11f1-92f3-1e004e000380",
  "cmd": "org.apache.cloudstack.api.command.admin.vm.UnmanageVMInstanceCmd",
  "completed": "2026-03-17T07:33:20+0000",
  "created": "2026-03-17T07:33:20+0000",
  "domainid": "28ca91c8-21c6-11f1-92f3-1e004e000380",
  "domainpath": "ROOT",
  "jobid": "59a56976-d640-419b-b135-86706c5fee19",
  "jobinstanceid": "0aa8147a-1002-49e9-bcc6-5af4b35f05d2",
  "jobinstancetype": "VirtualMachine",
  "jobprocstatus": 0,
  "jobresult": {
    "errorcode": 530,
    "errortext": "No bean named 'com.cloud.kubernetes.cluster.KubernetesServiceHelper' available"
  },
  "jobresultcode": 530,
  "jobresulttype": "object",
  "jobstatus": 2,
  "userid": "7f09fbfa-21c6-11f1-92f3-1e004e000380"
}
🙈 Error: async API failed for job 59a56976-d640-419b-b135-86706c5fee19

The message can be similar to the one when a end user tries to destroy a machine which is part of the cks cluster

nvazquez · 2026-03-17T13:24:17Z

@blueorangutan package

blueorangutan · 2026-03-17T13:26:07Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-03-17T13:38:48Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 17173

nvazquez · 2026-03-17T14:06:17Z

@blueorangutan package

blueorangutan · 2026-03-17T14:08:04Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-03-17T15:13:47Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17175

blueorangutan · 2026-03-17T20:46:22Z

[SF] Trillian test result (tid-15679)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51262 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12800-t15679-kvm-ol8.zip
Smoke tests completed. 147 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_create_pvlan_network	`Error`	0.13	test_pvlan.py
test_01_unmanage_vm_cycle_persistent_domain	`Error`	58.14	test_vm_lifecycle_unmanage_kvm_import.py
test_01_unmanage_vm_cycle_persistent_domain	`Error`	58.14	test_vm_lifecycle_unmanage_kvm_import.py
test_02_unmanage_stopped_vm_cycle_persistent_domain	`Error`	190.26	test_vm_lifecycle_unmanage_kvm_import.py
test_02_unmanage_stopped_vm_cycle_persistent_domain	`Error`	190.27	test_vm_lifecycle_unmanage_kvm_import.py
ContextSuite context=TestUnmanageKvmVM>:teardown	`Error`	190.31	test_vm_lifecycle_unmanage_kvm_import.py

nvazquez · 2026-03-17T23:28:34Z

@blueorangutan test

blueorangutan · 2026-03-17T23:30:03Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-03-18T00:12:39Z

[SF] Trillian Build Failed (tid-15686)

nvazquez · 2026-03-18T01:16:36Z

@blueorangutan test

blueorangutan · 2026-03-18T01:18:04Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

nvazquez · 2026-03-18T01:44:53Z

@blueorangutan package

blueorangutan · 2026-03-18T01:46:03Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-03-18T01:51:29Z

[SF] Trillian Build Failed (tid-15687)

blueorangutan · 2026-03-18T02:42:39Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17181

nvazquez · 2026-03-18T03:14:31Z

@blueorangutan test

blueorangutan · 2026-03-18T03:16:04Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

nvazquez added this to the 4.22.1 milestone Mar 12, 2026

nvazquez requested review from DaanHoogland, Pearl1594, kiranchavala, shwstppr, sureshanaparti and weizhouapache March 12, 2026 10:43

nvazquez added type:bug component:kubernetes labels Mar 12, 2026

nvazquez mentioned this pull request Mar 12, 2026

CKS cluster goes into alert state when worker node is unmanaged #12783

Open

kiranchavala self-assigned this Mar 12, 2026

sureshanaparti reviewed Mar 12, 2026

View reviewed changes

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti added the status:needs-testing label Mar 12, 2026

sureshanaparti linked an issue Mar 12, 2026 that may be closed by this pull request

CKS cluster goes into alert state when worker node is unmanaged #12783

Open

sureshanaparti added this to Apache CloudStack 4.22.1 Mar 12, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Mar 12, 2026

sureshanaparti approved these changes Mar 12, 2026

View reviewed changes

nvazquez added the ready-for-testing label Mar 12, 2026

DaanHoogland approved these changes Mar 12, 2026

View reviewed changes

kiranchavala reviewed Mar 17, 2026

View reviewed changes

This was referenced Mar 17, 2026

Validate and don't allow the api recoverVirtualMachine for cks clusters #12837

Open

Validate and don't allow the api createVMFromBackup for cks clusters #12840

Open

Fix bean injection

8fd6b8f

Fix unit tests

27101f6

nvazquez changed the title ~~[4.22] Prevent unmanaging VM from CloudStack if it is part of a CKS cluster~~ [4.22] Prevent unmanaging or recovering a VM if it is part of a CKS cluster Mar 18, 2026

nvazquez linked an issue Mar 18, 2026 that may be closed by this pull request

Validate and don't allow the api recoverVirtualMachine for cks clusters #12837

Open

Include recoverVirtualMachine API validation

48073b3

Conversation

nvazquez commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Mar 12, 2026

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

nvazquez commented Mar 12, 2026

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

nvazquez commented Mar 12, 2026

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

kiranchavala commented Mar 13, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

kiranchavala commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

nvazquez commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

nvazquez commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 17, 2026

Uh oh!

blueorangutan commented Mar 18, 2026

Uh oh!

nvazquez commented Mar 18, 2026

Uh oh!

blueorangutan commented Mar 18, 2026

Uh oh!

nvazquez commented Mar 18, 2026

Uh oh!

nvazquez commented Mar 12, 2026 •

edited

Loading

codecov bot commented Mar 12, 2026 •

edited

Loading