Skip to content

✨ WIP: Add affinity/anti-affinity to VirtualMachine spec #3645

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

Jump to bottom
Draft
wants to merge 4 commits into
base: release-1.14
Choose a base branch
from
Draft

✨ WIP: Add affinity/anti-affinity to VirtualMachine spec #3645

wants to merge 4 commits into from
+774 −31

Conversation

srm09
Copy link
Contributor

@srm09 srm09 commented Sep 29, 2025

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added this to the v1.14 milestone Sep 29, 2025
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 29, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign chrischdi for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 29, 2025
zhanggbj
zhanggbj reviewed Sep 30, 2025
View reviewed changes
pkg/services/vmoperator/vmopmachine.go Outdated

// Check the presence of the node-pool label on the VirtualMachineGroup
nodePool := supervisorMachineCtx.Machine.Labels[clusterv1.MachineDeploymentNameLabel]
if zone, ok := vmOperatorVMGroup.Labels[fmt.Sprintf("capv/%s", nodePool)]; ok && zone != "" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed in capv design doc, adding prefix may will fail badly when using long node pool names. I've dropped the prefix in VMG controller.

pkg/services/vmoperator/vmopmachine.go Outdated
}
}

// Check the presence of the node-pool label on the VirtualMachineGroup
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: let's use Machine Deployment in capv instead of node pool.

zhanggbj
zhanggbj reviewed Sep 30, 2025
View reviewed changes
pkg/services/vmoperator/vmopmachine.go Outdated
// Check the presence of the node-pool label on the VirtualMachineGroup
nodePool := supervisorMachineCtx.Machine.Labels[clusterv1.MachineDeploymentNameLabel]
if zone, ok := vmOperatorVMGroup.Labels[fmt.Sprintf("capv/%s", nodePool)]; ok && zone != "" {
supervisorMachineCtx.VSphereMachine.Spec.FailureDomain = ptr.To(zone)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For day 2 operations, we only need to create the VM with a label "topology.kubernetes.io/zone: Zone-x", but no need to set VSphereMachine.Spec.FailureDomain or Machine.Spec.FailureDomain. We should keep them consistent since they're empty from cluster specification.

After create VM with lable, VM Service will place it into that zone.

@srm09 srm09 force-pushed the nodepool/vm-aff-antiaff branch from 597af80 to 87609a7 Compare October 7, 2025 21:57
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 7, 2025
@srm09 srm09 force-pushed the nodepool/vm-aff-antiaff branch from 41a03e3 to 1759351 Compare October 8, 2025 16:24
zhanggbj and others added 4 commits October 8, 2025 09:27
@zhanggbj @srm09
Bump VMOP and add NodeAutoPlacement Feature Gate
f78a22f 
- Bump VMOP including Node AF/AAF support
- Add NodeAutoPlacement Feature Gate

(cherry picked from commit 700c8ae)
@zhanggbj @srm09
Add VMG controller of node auto placement
23b532b 
(cherry picked from commit cfeb862)
@srm09
Updates logic for VMG creation
1e7dc55 
Removes the extra cases for VMG creation, such that VMG is created for:
1. Multiple zones, multiple MDs with no failureDomain
2. Multiple zones, multiple MDs with failureDomain
3. Single zone, existing cluster with no failureDomain MDs

Signed-off-by: Sagar Muchhal <[email protected]>
@srm09
Initial impl for VSphereMachine AAF changes
fa7432f 
- Updates VMOP API dependency

Misc VMG fixes
- Use namingStrategy to calculate VM names
- Use MachineDeployment names for VMG placement label
- Includes all machinedeployments to generate node-pool -> zone
  mapping

Fixes VMG webhook validation error
- Adds cluster-name label to Af/AAF spec
- re-adds zone topology key back to anti-aff spec

Signed-off-by: Sagar Muchhal <[email protected]>
@srm09 srm09 force-pushed the nodepool/vm-aff-antiaff branch from 1759351 to fa7432f Compare October 8, 2025 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@vrabbi vrabbi Awaiting requested review from vrabbi

1 more reviewer

@zhanggbj zhanggbj zhanggbj left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.14
Development

Successfully merging this pull request may close these issues.
3 participants
@srm09 @k8s-ci-robot @zhanggbj