[GEP-33] Adoption of Capabilities Cloudprofile-API Change#1480
Merged
hebelsan merged 13 commits intogardener:masterfrom Oct 1, 2025
Merged
[GEP-33] Adoption of Capabilities Cloudprofile-API Change#1480hebelsan merged 13 commits intogardener:masterfrom
hebelsan merged 13 commits intogardener:masterfrom
Conversation
gardener-robot
added
kind/api-change
gardener-robot-ci-1
added
the
reviewed/ok-to-test
github-actions
bot
added
needs/ok-to-test
hebelsan
reviewed
Sep 18, 2025
Contributor
hebelsan
left a comment
hebelsan
left a comment
There was a problem hiding this comment.
looks good, only two small nits.
pkg/apis/aws/types_cloudprofile.go
Outdated
|
|
||
| // CapabilitySet groups all RegionAMIMappings for a specific et of capabilities. | ||
| type CapabilitySet struct { | ||
| // MachineImageFlavor groups all RegionAMIMappings for a specific et of capabilities. |
Contributor
There was a problem hiding this comment.
set of capabilities instead of et of capabilities
pkg/apis/aws/helper/helper.go
Outdated
| func filterCapabilitySetsByRegion(capabilitySets []api.CapabilitySet, regionName string) []*api.CapabilitySet { | ||
| var compatibleSets []*api.CapabilitySet | ||
| func filterCapabilityFlavorsByRegion(capabilityFlavors []api.MachineImageFlavor, regionName string) []*api.MachineImageFlavor { | ||
| var compatibleSets []*api.MachineImageFlavor |
Contributor
There was a problem hiding this comment.
var compatibleSets renaming the variable to compatibleFlavors improves readability.
gardener-robot-ci-2
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
gardener-robot-ci-2
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
…ofile and related structures
…ofile and related structures
gardener-robot-ci-2
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
Roncossek
force-pushed
the
capability-flavors
branch
from
5613c03 to
7328c6e
Compare
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
gardener-robot-ci-1
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
hebelsan
reviewed
Sep 30, 2025
|
|
||
| func validateRegions(regions []apisaws.RegionAMIMapping, version, name string, hasCloudProfileCapabilities bool, jdxPath *field.Path) field.ErrorList { | ||
| // validateRegions validates the regions of a machine image version or capability flavor. | ||
| func validateRegions(regions []apisaws.RegionAMIMapping, version, name string, capabilityDefinitions []gardencorev1beta1.CapabilityDefinition, jdxPath *field.Path) field.ErrorList { |
Contributor
There was a problem hiding this comment.
The signature of validateRegions is (regions []..., version, name string, ...), but all call sites pass (name, version, ...) this looks like an error.
Contributor
Author
There was a problem hiding this comment.
Reordered the parameter. And added some UT to check the output of the error details.
| if isCapabilitiesCloudProfile { | ||
| capabilityDefinitions = []gardencorev1beta1.CapabilityDefinition{ | ||
| {Name: "some-capability", Values: []string{"a", "b", "c"}}, | ||
| {Name: v1beta1constants.ArchitectureName, Values: []string{v1beta1constants.ArchitectureAMD64, v1beta1constants.ArchitectureARM64}}, |
Contributor
There was a problem hiding this comment.
Why did you you remove the constants?
Contributor
Author
There was a problem hiding this comment.
See "Use constants in test code with care" in the test guide.
Contributor
There was a problem hiding this comment.
From the test guide I read that one shouldn't use constants from the same package as the tested code.
But anyway I'm fine with the change.
| namePool2 = "pool-2" | ||
| minPool2 = 30 | ||
| maxPool2 = 45 | ||
| priorityPool2 = 100 |
Contributor
There was a problem hiding this comment.
Why did you remove the priority field?
Contributor
Author
There was a problem hiding this comment.
Sorry, my bad. The field was changed from int32 to *int32 in the latest gardener. I correctly adopted it now.
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
Roncossek
force-pushed
the
capability-flavors
branch
from
f4524eb to
f5876f9
Compare
ghost
added
the
reviewed/ok-to-test
Contributor
|
This change set involves significant updates to a project related to managing cloud profiles and machine images. Key updates focus on transitioning from "CapabilitySets" to "MachineImageFlavors," updating dependencies, improving validation and mutation logic, and code structuring. The updates are aimed at enhancing the functionality of managing machine images and their capabilities in a cloud environment, potentially leading to better compatibility and configuration validation. Walkthrough
Model: gpt-4o | Prompt Tokens: 54073 | Completion Tokens: 191 |
github-actions
bot
removed
the
reviewed/ok-to-test
gardener-robot
added
reviewed/lgtm
ghost
added
the
reviewed/ok-to-test
github-actions
bot
removed
the
reviewed/ok-to-test
gardener-robot
added
the
status/closed
Bobi-Wan
added a commit
to Bobi-Wan/inventory
that referenced
this pull request
Nov 4, 2025
…ws version to get fix for breaking spec Bug: While strict decoding a providerConfig (defined in aws extension), we encounter a field name change (capabilitySets -> capabilityFlavours). Even though we don't use it, the strict decoder fails and reports an error. PR breaking the current functionality: gardener/gardener-extension-provider-aws#1480 Fix: bump to provider extension aws, so the expencted cloudprofile.spec.providerconfig has the same schema as the ones in the dev landscape.
Bobi-Wan
added a commit
to Bobi-Wan/inventory
that referenced
this pull request
Nov 4, 2025
…ws version to get fix for breaking spec Bug: While strict decoding a providerConfig (defined in aws extension), we encounter a field name change (capabilitySets -> capabilityFlavours). Even though we don't use it, the strict decoder fails and reports an error. PR breaking the current functionality: gardener/gardener-extension-provider-aws#1480 Fix: bump to provider extension aws, so the expencted cloudprofile.spec.providerconfig has the same schema as the ones in the dev landscape.
Bobi-Wan
added a commit
to Bobi-Wan/inventory
that referenced
this pull request
Nov 5, 2025
…et fix for breaking spec Bug: While strict decoding a providerConfig (defined in aws extension), we encounter a field name change (capabilitySets -> capabilityFlavours). Even though we don't use it, the strict decoder fails and reports an error. PR breaking the current functionality: gardener/gardener-extension-provider-aws#1480 Fix: bump to provider extension aws, so the expencted cloudprofile.spec.providerconfig has the same schema as the ones in the dev landscape.
Bobi-Wan
added a commit
to gardener/inventory
that referenced
this pull request
Nov 5, 2025
…et fix for breaking spec Bug: While strict decoding a providerConfig (defined in aws extension), we encounter a field name change (capabilitySets -> capabilityFlavours). Even though we don't use it, the strict decoder fails and reports an error. PR breaking the current functionality: gardener/gardener-extension-provider-aws#1480 Fix: bump to provider extension aws, so the expencted cloudprofile.spec.providerconfig has the same schema as the ones in the dev landscape.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
How to categorize this PR?
/area control-plane
/kind enhancement
/platform aws
What this PR does / why we need it:
This PR is part of GEP-33 Machine Image Capabilities
It adopts api changes to the alpha feature of
CloudProfileCapabilitiesmade in gardener/gardener#12751:The field
CapabilitySetsof MachineImageVersion is renamed toCapabilityFlavorsto improve readability and avoid confusion with by e.g. a "set of capability values for a given capability name". As a consequence the corresponding fieldspec.ProviderConfig.MachineImages[].Versions[].capabilitySetsis renamed toCapabilityFlavorsas well.The change to
spec.machineCapabilitiesis to stay in line withmachineTypesandmachineImages.Which issue(s) this PR fixes:
Part of: gardener/gardener#11301
Special notes for your reviewer:
Release note: