Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

Merged
kubermatic-bot merged 2 commits intokubermatic:release/v1.61kubermatic/machine-controller:release/v1.61from
soer3n:cherry-pick-1906-to-release/v1.61soer3n/machine-controller:cherry-pick-1906-to-release/v1.61Copy head branch name to clipboard
Apr 7, 2025
Merged

[release/v1.61] Cherry pick 1906 to release/v1.61#1916
kubermatic-bot merged 2 commits intokubermatic:release/v1.61kubermatic/machine-controller:release/v1.61from
soer3n:cherry-pick-1906-to-release/v1.61soer3n/machine-controller:cherry-pick-1906-to-release/v1.61Copy head branch name to clipboard

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 <srenhenning@googlemail.com>

* update kubevirt testdata

Signed-off-by: soer3n <srenhenning@googlemail.com>

* revert testdata change and add condition for vm cpu assignment

Signed-off-by: soer3n <srenhenning@googlemail.com>

* switch to providerSpec for enabling vcpu assignment

Signed-off-by: soer3n <srenhenning@googlemail.com>

* 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 <srenhenning@googlemail.com>

* revert unnessecarry changes to mocked kubevirt vm

Signed-off-by: soer3n <srenhenning@googlemail.com>

* changes after review

Signed-off-by: soer3n <srenhenning@googlemail.com>

---------

Signed-off-by: soer3n <srenhenning@googlemail.com>
@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 <srenhenning@googlemail.com>

revert change regarding import of sdk submodule

Signed-off-by: soer3n <srenhenning@googlemail.com>

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

Signed-off-by: soer3n <srenhenning@googlemail.com>
@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

kubermatic-bot commented Apr 7, 2025

[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

Details 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

kubermatic-bot commented Apr 7, 2025

LGTM label has been added.

DetailsGit 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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.