Skip to content

Conversation

Roncossek
Copy link
Contributor

@Roncossek Roncossek commented Jul 14, 2025

How to categorize this PR?

/kind enhancement
/area usability
/area os

What this PR does / why we need it:
Implementation as part of GEP-33.

  1. Adds capability filter in the shoot maintenance controller for machine image versions.

  2. Adds capability support to worker image version defaulting during shoot admission.

    This functionality is part of getDefaultMachineImage. The check is performed only if the worker specifies a valid machineType. If the machineType is not found in the CloudProfile, the check is skipped. We avoid failing early to ensure that the error message at L1172 still provides users with recommendations for supported machineTypes.

Which issue(s) this PR fixes:
Part of #11301

Special notes for your reviewer:
@LucaBernstein @timuthy

Release note:

Adds machine capability based image defaulting to Shoots created with Cloudprofiles using Capabilities.

@gardener-prow gardener-prow bot added kind/enhancement Enhancement, improvement, extension area/usability Usability related area/os Operator system related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 14, 2025
@Roncossek Roncossek force-pushed the shoot-image-defaulting branch from c95d063 to 1ed9590 Compare July 14, 2025 15:31
@Roncossek Roncossek force-pushed the shoot-image-defaulting branch from cf2daae to 81da807 Compare July 17, 2025 08:31
@gardener-prow gardener-prow bot added the do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. label Jul 17, 2025
@Roncossek Roncossek force-pushed the shoot-image-defaulting branch from 31a3596 to c2f0a12 Compare July 17, 2025 16:18
@gardener-prow gardener-prow bot removed the do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. label Jul 17, 2025
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 28, 2025
Copy link
Member

@LucaBernstein LucaBernstein left a comment

Choose a reason for hiding this comment

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

Thank you for advancing this topic incrementally.
Some small findings from my side.

@Roncossek Roncossek force-pushed the shoot-image-defaulting branch from c2f0a12 to 771d238 Compare July 31, 2025 13:14
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 31, 2025
@LucaBernstein
Copy link
Member

/lgtm
/cc @timuthy

@gardener-prow gardener-prow bot requested a review from timuthy July 31, 2025 13:53
@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2025
Copy link
Contributor

gardener-prow bot commented Jul 31, 2025

LGTM label has been added.

Git tree hash: 40221c6f82b3facd9560a8a21070a3f45ffe7d28

@Roncossek
Copy link
Contributor Author

/retest-required

1 similar comment
@Roncossek
Copy link
Contributor Author

/retest-required

Copy link
Member

@timuthy timuthy left a comment

Choose a reason for hiding this comment

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

Nice! Thanks for the enhancements and waiting for my feedback.

@gardener-prow gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 5, 2025
@gardener-prow gardener-prow bot requested a review from LucaBernstein August 5, 2025 10:47
Copy link
Member

@timuthy timuthy left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2025
Copy link
Contributor

gardener-prow bot commented Aug 6, 2025

LGTM label has been added.

Git tree hash: fa636aa1e3faa2eb096c4d2b74d1f4906d90800d

Copy link
Contributor

gardener-prow bot commented Aug 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timuthy

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

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2025
@gardener-prow gardener-prow bot merged commit 83614cf into gardener:master Aug 6, 2025
19 checks passed
Duciwuci pushed a commit to stackitcloud/gardener that referenced this pull request Sep 1, 2025
…ulting (gardener#12529)

* Enhance worker machine image defaulting with capabilities support

* Implement capabilities filtering for machine images in shoot maintenance controller

* move capability filter logic to helper package and cleanup nits

* improve readability and update docstrings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/os Operator system related area/usability Usability related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants