Skip to content

[release/v1.61] Cherry pick 1906 to release/v1.61 #1916

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
Merged
merged 2 commits into from
Apr 7, 2025
Merged

[release/v1.61] Cherry pick 1906 to release/v1.61 #1916

merged 2 commits into from
Apr 7, 2025

Conversation

soer3n
Copy link
Contributor

@soer3n soer3n commented Apr 4, 2025 •
edited by moadqassem
Loading

This is a manual cherry-pick of #1906 and #1912

A new field `cloudProviderSpec.virtualMachine.template.vcpus` was added to kubevirt provider. When `vcpus.cores` is set, the cpus for the virtual machine will be configured in `spec.template.spec.domain.cpu` instead of setting resource requests and limits explicit. The webhook validation will fail if both `vcpus` and `cpus` are configured for a machine.

/assign soer3n

@kubermatic-bot kubermatic-bot added dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 4, 2025
@soer3n soer3n force-pushed the cherry-pick-1906-to-release/v1.61 branch from 6a7f30b to e70864f Compare April 4, 2025 12:17
@soer3n soer3n changed the title Cherry pick 1906 to release/v1.61 [release/v1.61] Cherry pick 1906 to release/v1.61 Apr 4, 2025
@soer3n soer3n force-pushed the cherry-pick-1906-to-release/v1.61 branch from 65e2b36 to 8239c41 Compare April 4, 2025 19:42
@soer3n
Change KubeVirt VM CPU assignment to not overwrite cpu alloc ratio (k…
1815216 
…ubermatic#1906)

* change kubevirt vm cpu assignment to not overwrite cpu alloc ratio

Signed-off-by: soer3n <[email protected]>

* update kubevirt testdata

Signed-off-by: soer3n <[email protected]>

* revert testdata change and add condition for vm cpu assignment

Signed-off-by: soer3n <[email protected]>

* switch to providerSpec for enabling vcpu assignment

Signed-off-by: soer3n <[email protected]>

* adapt kubevirt cpu struct

* adapt kubevirt cpu struct for configuring vcpus for a virtual machine
* modify logic in function for rendering resource requests and limits
* modify validation accordingly to be a bit more specific regarding resources

Signed-off-by: soer3n <[email protected]>

* revert unnessecarry changes to mocked kubevirt vm

Signed-off-by: soer3n <[email protected]>

* changes after review

Signed-off-by: soer3n <[email protected]>

---------

Signed-off-by: soer3n <[email protected]>
@soer3n soer3n force-pushed the cherry-pick-1906-to-release/v1.61 branch from 8239c41 to 1815216 Compare April 4, 2025 20:06
@soer3n
fix kubevirt cpu check + update sdk version in go.mod
ce286aa 
Signed-off-by: soer3n <[email protected]>

revert change regarding import of sdk submodule

Signed-off-by: soer3n <[email protected]>

kubevirt resources and vcpus should only be parsed wihtout specified instance type

Signed-off-by: soer3n <[email protected]>
@soer3n soer3n force-pushed the cherry-pick-1906-to-release/v1.61 branch from a94f086 to ce286aa Compare April 5, 2025 06:07
moadqassem
moadqassem approved these changes Apr 7, 2025
View reviewed changes
Copy link
Member

@moadqassem moadqassem left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2025
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: moadqassem

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

The pull request process is described 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

@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1811aaf5d89574788455280f9dc79d6951c01533

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 7, 2025
@kubermatic-bot kubermatic-bot merged commit e544b77 into kubermatic:release/v1.61 Apr 7, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moadqassem moadqassem moadqassem approved these changes

Assignees

@moadqassem moadqassem

@soer3n soer3n

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@soer3n @kubermatic-bot @moadqassem