CKS: Allow affinity group selection during cluster creation by Damans227 · Pull Request #12386 · apache/cloudstack

Damans227 · 2026-01-07T18:22:26Z

Description

This PR adds support for specifying affinity groups during CKS (CloudStack Kubernetes Service) cluster creation, allowing users to control VM placement for high availability.

Changes:

New nodeaffinitygroups parameter for createKubernetesCluster API
Supports per-node-type (CONTROL, WORKER, ETCD) affinity group assignment
New kubernetes_cluster_affinity_group_map table for normalized storage

Design doc:

https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+users+to+select+affinity+group+during+managed+CKS+cluster+creation

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

cmk based api testing:

Test results

Screen recording

Screencast.from.2026-01-13.06-47-14.mp4

Screenshots

How Has This Been Tested?

Tested on simulator environment
Added Unit tests
Tested against KVM

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

Invalid affinity group UUID
Invalid node type
Duplicate node type entries
Clusters without affinity groups (backward compatibility)

…to CreateKubernetesClusterCmd

…ency

…ndling and enhance node type validation tests

…ubernetesClusterVO

…bernetesClusterManagerImpl

…lusterVO to support multiple IDs

…erviceHelper and related classes

…ting kubernetes_cluster

blueorangutan · 2026-01-07T19:53:01Z

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

codecov · 2026-01-08T06:10:51Z

Codecov Report

❌ Patch coverage is 39.76834% with 312 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.94%. Comparing base (c465caf) to head (6f00ed7).
⚠️ Report is 228 commits behind head on main.

Files with missing lines	Patch %	Lines
...bernetes/cluster/KubernetesClusterManagerImpl.java	42.02%	116 Missing and 4 partials ⚠️
...r/actionworkers/KubernetesClusterActionWorker.java	28.84%	37 Missing ⚠️
...KubernetesClusterResourceModifierActionWorker.java	0.00%	36 Missing ⚠️
...er/actionworkers/KubernetesClusterScaleWorker.java	0.00%	31 Missing ⚠️
.../dao/KubernetesClusterAffinityGroupMapDaoImpl.java	0.00%	27 Missing ⚠️
...uster/UpdateKubernetesClusterAffinityGroupCmd.java	0.00%	25 Missing ⚠️
...ubernetes/cluster/KubernetesServiceHelperImpl.java	76.71%	16 Missing and 1 partial ⚠️
...er/actionworkers/KubernetesClusterStartWorker.java	0.00%	5 Missing ⚠️
...kubernetes/cluster/CreateKubernetesClusterCmd.java	0.00%	5 Missing ⚠️
...s/cluster/KubernetesClusterAffinityGroupMapVO.java	86.20%	3 Missing and 1 partial ⚠️
... and 3 more

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #12386      +/-   ##
============================================
+ Coverage     17.76%   17.94%   +0.18%     
- Complexity    15859    16223     +364     
============================================
  Files          5923     5944      +21     
  Lines        530470   533807    +3337     
  Branches      64823    65330     +507     
============================================
+ Hits          94243    95812    +1569     
- Misses       425682   427248    +1566     
- Partials      10545    10747     +202

Flag	Coverage Δ
uitests	`3.65% <ø> (+0.08%)`	⬆️
unittests	`19.06% <39.76%> (+0.21%)`	⬆️

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.

…rnetesCluster

Damans227 · 2026-02-19T13:59:46Z

@blueorangutan package

blueorangutan · 2026-02-19T14:02:04Z

@Damans227 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-19T15:20:54Z

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

…dNodeType method

…nityGroupService

Damans227 · 2026-02-23T16:07:25Z

@blueorangutan package

blueorangutan · 2026-02-23T16:08:04Z

@Damans227 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-23T17:24:05Z

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

…ion error

…r lookup

Damans227 · 2026-02-23T20:48:06Z

@blueorangutan package

blueorangutan · 2026-02-23T20:50:03Z

@Damans227 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-23T21:42:08Z

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

…y checks

Damans227 · 2026-02-25T18:11:25Z

@blueorangutan package

blueorangutan · 2026-02-25T18:12:04Z

@Damans227 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-25T19:18:12Z

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

kiranchavala · 2026-02-26T06:11:39Z

@blueorangutan test

kiranchavala

LGTM

Test Case Execution	Result
Test affinity groups on cks control nodes	Pass
Test affinity groups on cks worker nodes	Pass
Test affinity groups on cks etcd nodes	Pass
Test differnet affinity groups on both cks control and worker nodes	Pass
Test manual scaling of cks cluster which has affinity groups present on control and worker nodes	Pass
Test auto scaling of cks cluster which has affinity groups present on control and worker nodes	Pass
Test changing of affinity groups on a stopped cks cluster	Pass
Test changing of affinity groups on a cks instance which is part of a cks cluster	Pass
Test creating of cks cluster which has invalid affinity group	Pass
Test creating of cks cluster which has invalid node type	Pass
Test the applying affinity groups on a cks cluster which was present before the upgarde	Pass
Test listing of affinity groups for a user when creating a cks cluster	Pass
Test the creation of affinity groups for a user from a admin user	Pass
Test cks deployement with affinitygroups from a project	Pass
Test the cks deployment with affinity groups from a user account	Pass
Test scaling with affinity groups when there is no capacity on the hypervisor host	Pass

Daman Arora added 21 commits January 6, 2026 08:51

Add NODE_TYPE_AFFINITY_GROUP_MAP constant and affinity group mapping …

fe0a2a3

…to CreateKubernetesClusterCmd

Merge branch 'main' into implement-cks-node-affinity

9f137af

Implement getAffinityGroupNodeTypeMap in kubernetes service helper

a7e5270

Rename kubernetesClusterHelper to kubernetesServiceHelper for consist…

58804a3

…ency

Refactor KubernetesServiceHelperImplTest to include affinity group ha…

1114f75

…ndling and enhance node type validation tests

Add affinity group columns to kubernetes_cluster table

319c0f6

Add affinity group ID fields and accessors to KubernetesCluster and K…

8bf7a45

…ubernetesClusterVO

Add affinity group handling for worker, control, and etcd nodes in Ku…

4706d03

…bernetesClusterManagerImpl

Refactor affinity group handling in KubernetesCluster and KubernetesC…

fe5c026

…lusterVO to support multiple IDs

Update affinity group handling to support multiple IDs in KubernetesS…

4da3bce

…erviceHelper and related classes

Refactor affinity group tests in KubernetesServiceHelperImplTest

58799c2

Add per node type affinity group support for cks

0706410

use a new table kubernetes_cluster_affinity_group_map instead of exis…

a13f360

…ting kubernetes_cluster

add new resource KubernetesClusterAffinityGroupMap

6e3ede9

Refactor affinity group mapping

f625d6e

use updated getAffinityGroupNodeTypeMap

35a7bab

use DAO query instead of parsing comma-separated UUIDs

af97ea3

remove affinity group mappings when a cluster is deleted

c58dee0

use @component for spring bean

e0d4183

remove affinity group on cleanup in mcloud managed cks

201e563

add affinty groups to cks list response

2405249

boring-cyborg bot added component:api component:kubernetes labels Jan 7, 2026

cleanup

96c0705

DaanHoogland added this to the 4.23.0 milestone Jan 8, 2026

Daman Arora added 3 commits January 8, 2026 11:27

add unit tests

a05581c

add affinity group details to user VM response

8f5ee6d

update user VM response handling in KubernetesClusterManagerImpl

d27b2f4

Damans227 added 6 commits February 18, 2026 11:52

Cleanup host retrieval logic

5ba35e6

Filter out affinity groups of type 'ExplicitDedication' in CreateKube…

1acb8c0

…rnetesCluster

UI improvements around ownership of affinity groups and cks

2029a49

Add domain/account-aware resource filtering to CKS cluster creation form

d3b4b2c

Block VM-level affinity change on CKS VM

40e7807

Reject affinity update on running cluster

353ce37

weizhouapache linked an issue Feb 19, 2026 that may be closed by this pull request

Kubernetes nodes with affinity group #6485

Open

Damans227 added 3 commits February 23, 2026 09:31

Handle empty affinity group maps in listAffinityGroupIdsByClusterIdAn…

c8d03f5

…dNodeType method

Handle empty affinity group IDs in getAffinityGroupIdsForNodeType method

21b2f38

Implement affinity group mapping in KubernetesClusterManager and Affi…

d5b1257

…nityGroupService

Damans227 requested review from DaanHoogland and nvazquez February 23, 2026 15:06

Daman Arora added 2 commits February 23, 2026 15:46

Add affinity type constants and use them to fix cross-plugin compilat…

b7e2d12

…ion error

Revert unnecessary AffinityGroupService interface change and processo…

6ee30eb

…r lookup

kiranchavala mentioned this pull request Feb 25, 2026

CKS cluster remains in Alert state if the scaling fails due to capacity issue on the hypervisor host #12699

Closed

CKS scaling reverts to Running on failure with VM cleanup and affinit…

6f00ed7

…y checks

kiranchavala approved these changes Feb 26, 2026

View reviewed changes

Conversation

Damans227 commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes:

Design doc:

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

cmk based api testing:

Screen recording

Screenshots

How Has This Been Tested?

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

Uh oh!

blueorangutan commented Jan 7, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

Damans227 commented Feb 19, 2026

Uh oh!

blueorangutan commented Feb 19, 2026

Uh oh!

blueorangutan commented Feb 19, 2026

Uh oh!

Damans227 commented Feb 23, 2026

Uh oh!

blueorangutan commented Feb 23, 2026

Uh oh!

blueorangutan commented Feb 23, 2026

Uh oh!

Damans227 commented Feb 23, 2026

Uh oh!

blueorangutan commented Feb 23, 2026

Uh oh!

blueorangutan commented Feb 23, 2026

Uh oh!

Damans227 commented Feb 25, 2026

Uh oh!

blueorangutan commented Feb 25, 2026

Uh oh!

blueorangutan commented Feb 25, 2026

Uh oh!

kiranchavala commented Feb 26, 2026

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Damans227 commented Jan 7, 2026 •

edited

Loading

codecov bot commented Jan 8, 2026 •

edited

Loading