Enable cloudProfile reference as complement to cloudProfileName #10093

LucaBernstein · 2024-07-09T06:57:44Z

How to categorize this PR?

/area usability
/kind enhancement

What this PR does / why we need it:

Make Shoot cloudProfileName optional and complement with cloudProfile reference
Extend shoot validation to check for cloudProfileName and cloudProfile
Extend shoot strategy to default fill cloudProfileName from cloudProfile and vice versa ("sync")
Provide method in reconciler to get applicable cloud profile

Which issue(s) this PR fixes:

Relates to #9504

Special notes for your reviewer:

Release note:

Evaluate `shoot.Spec.CloudProfile` and `shoot.Spec.CloudProfileName` fields together to determine the applicable cloud profile in order to prepare for namespaced cloud profiles.

Use `shoot.Spec.CloudProfile` as the primary directive to specify the cloud profile to use. The value will by synced to the field `shoot.Spec.CloudProfileName` (until it is deprecated and eventually removed in the future). If no cloud profile kind is provided, it will default to `CloudProfile`.

gardener-prow · 2024-07-09T06:57:46Z

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

timuthy · 2024-07-09T07:48:02Z

/assign

timuthy

Thanks for the PR 👍 Please find some first feedback in-line. I haven't checked all changes in detail yet and will continue this afternoon.

example/gardener-local/controlplane/values.yaml

pkg/admissioncontroller/webhook/auth/seed/graph/eventhandler_shoot.go

pkg/apis/core/v1beta1/constants/types_constants.go

pkg/apis/core/v1beta1/types_shoot.go

pkg/apiserver/registry/core/shoot/strategy.go

pkg/controllerutils/associations.go

pkg/apis/core/field_constants.go

pkg/apiserver/registry/core/shoot/strategy.go

pkg/utils/gardener/namespacedcloudprofile.go

plugin/pkg/utils/namespacedcloudprofile.go

timuthy

Thanks for the adjustments 🙂

pkg/apis/core/validation/shoot.go

pkg/apis/core/validation/shoot_test.go

pkg/apiserver/registry/core/shoot/storage/tableconvertor.go

pkg/apiserver/registry/core/shoot/strategy_test.go

plugin/pkg/utils/cloudprofile.go

plugin/pkg/utils/cloudprofile_test.go

test/integration/controllermanager/shoot/maintenance/maintenance_test.go

timuthy

Only minor points left 🙂

pkg/apiserver/registry/core/shoot/strategy_test.go

plugin/pkg/shoot/validator/admission_test.go

plugin/pkg/utils/cloudprofile_test.go

pkg/admissioncontroller/webhook/auth/seed/graph/eventhandler_shoot.go

LucaBernstein · 2024-07-25T12:53:46Z

Thanks @timuthy once again for your thorough review. I addressed your findings. Please find the newest commit added to this PR.

timuthy

Thank you 🙂
/lgtm
/approve

gardener-prow · 2024-07-25T14:41:41Z

LGTM label has been added.

Git tree hash: c7340e5c418e2386ffbbca3cb776c49adef476b1

gardener-prow · 2024-07-25T14:41:46Z

[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:

~~OWNERS~~ [timuthy]

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

- add `class` field (gardener/gardener#10254) - use `CloudProfile` (gardener/gardener#10093) - copy `.ci/third_party/component_descriptor` (gardener/gardener#10218) - replace local IPs (gardener/gardener#10019) - fix `imagevector.WithEnvOverrid` (gardener/gardener#10218) - fix `ForceDeleteShootAndWaitForDeletion` (gardener/gardener#10220)

* Bump github.com/gardener/gardener from 1.100.1 to 1.102.0 Bumps [github.com/gardener/gardener](https://github.com/gardener/gardener) from 1.100.1 to 1.102.0. - [Release notes](https://github.com/gardener/gardener/releases) - [Commits](gardener/gardener@v1.100.1...v1.102.0) --- updated-dependencies: - dependency-name: github.com/gardener/gardener dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Adapt code to changes in new gardener version: - add `class` field (gardener/gardener#10254) - use `CloudProfile` (gardener/gardener#10093) - copy `.ci/third_party/component_descriptor` (gardener/gardener#10218) - replace local IPs (gardener/gardener#10019) - fix `imagevector.WithEnvOverrid` (gardener/gardener#10218) - fix `ForceDeleteShootAndWaitForDeletion` (gardener/gardener#10220) * Address PR review feedback --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dimitar Kostadinov <dimitar.kostadinov@sap.com>

…ame` Ref gardener/gardener#10093

…ucture-cleanup-wait-period-seconds` annotation (#270) * Clean up usages of the already removed `shoot.gardener.cloud/infrastructure-cleanup-wait-period-seconds` annotation The annotation was removed in Gardener v1.94.0 with gardener/gardener#9632. * Replace the `.spec.cloudProfileName` field with `.spec.cloudProfile.name` Ref gardener/gardener#10093

…cture-cleanup-wait-period-seconds` annotation (#187) * Clean up usage of the already removed `shoot.gardener.cloud/infrastructure-cleanup-wait-period-seconds` annotation * Replace the `.spec.cloudProfileName` field with `.spec.cloudProfile.name` Ref gardener/gardener#10093

gardener-prow bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/usability Usability related kind/enhancement Enhancement, improvement, extension labels Jul 9, 2024

gardener-prow bot requested review from acumino and ialidzhikov July 9, 2024 06:57

gardener-prow bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Jul 9, 2024

gardener-prow bot assigned timuthy Jul 9, 2024

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch 2 times, most recently from a06d184 to c8f9eb7 Compare July 10, 2024 08:48

LucaBernstein mentioned this pull request Jul 10, 2024

☂️ [GEP-25] Introduce NamespacedCloudProfiles #9504

Open

45 tasks

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch from c8f9eb7 to d629874 Compare July 10, 2024 09:14

LucaBernstein marked this pull request as ready for review July 11, 2024 08:58

gardener-prow bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 11, 2024

gardener-prow bot requested a review from timebertt July 11, 2024 08:58

LucaBernstein mentioned this pull request Jul 11, 2024

Support shoot.Spec.CloudProfile with CloudProfiles and NamespacedCloudProfiles besides CloudProfileName gardener/dashboard#1971

Open

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch from d629874 to 60a8886 Compare July 12, 2024 14:23

LucaBernstein mentioned this pull request Jul 12, 2024

[GEP-25] Enable Shoot cloudProfile reference as complement to cloudProfileName gardener/gardener-extension-provider-aws#1000

Merged

timuthy requested changes Jul 15, 2024

View reviewed changes

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch 4 times, most recently from ec073bc to b46903c Compare July 15, 2024 15:06

timuthy requested changes Jul 16, 2024

View reviewed changes

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch 4 times, most recently from c0d4f67 to 5d25209 Compare July 17, 2024 07:27

timuthy requested changes Jul 22, 2024

View reviewed changes

LucaBernstein added 2 commits July 23, 2024 13:41

address review comments

214bb7e

make returned type more generic by switching to CloudProfileSpec

189b064

LucaBernstein force-pushed the gep-25-namespacedcloudprofiles-pt-1-i543201 branch from 1c31170 to 189b064 Compare July 23, 2024 12:07

LucaBernstein requested a review from timuthy July 24, 2024 09:02

timuthy requested changes Jul 25, 2024

View reviewed changes

address review comments

92bfc71

LucaBernstein requested a review from timuthy July 25, 2024 12:53

timuthy reviewed Jul 25, 2024

View reviewed changes

gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2024

gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 25, 2024

gardener-prow bot merged commit 38fb61d into gardener:master Jul 25, 2024

LucaBernstein deleted the gep-25-namespacedcloudprofiles-pt-1-i543201 branch July 26, 2024 08:05

LucaBernstein mentioned this pull request Sep 30, 2024

[GEP-25] Enable Shoot cloudProfile reference as complement to cloudProfileName gardener/gardener-extension-provider-gcp#853

Merged

LucaBernstein mentioned this pull request Oct 16, 2024

Allow custom machine images and versions in NamespacedCloudProfiles #10629

Merged

ialidzhikov added a commit to ialidzhikov/gardener-extension-registry-cache that referenced this pull request Oct 28, 2024

Replace the .spec.cloudProfileName field with `.spec.cloudProfile.n…

50a22c1

…ame` Ref gardener/gardener#10093

ialidzhikov added a commit to ialidzhikov/gardener-extension-shoot-rsyslog-relp that referenced this pull request Oct 28, 2024

Replace the .spec.cloudProfileName field with `.spec.cloudProfile.n…

1565a07

…ame` Ref gardener/gardener#10093

This was referenced Jan 14, 2025

Enable support for NamespacedCloudProfiles, including custom machine images (versions) gardener/gardener-extension-provider-alicloud#755

Merged

fix: Update to new CloudProfile reference gardener/documentation#568

Merged

LucaBernstein mentioned this pull request Apr 4, 2025

Proceed with replacement of Shoot .spec.cloudProfileName field in favor of shoot.spec.cloudProfile with new Kubernetes versions #11816

Merged

1 task

Enable cloudProfile reference as complement to cloudProfileName #10093

Enable cloudProfile reference as complement to cloudProfileName #10093

Uh oh!

Conversation

LucaBernstein commented Jul 9, 2024 • edited by rfranzke Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gardener-prow bot commented Jul 9, 2024

Uh oh!

timuthy commented Jul 9, 2024

Uh oh!

timuthy left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timuthy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timuthy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LucaBernstein commented Jul 25, 2024

Uh oh!

timuthy left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jul 25, 2024

Uh oh!

gardener-prow bot commented Jul 25, 2024

Uh oh!

Uh oh!

LucaBernstein commented Jul 9, 2024 •

edited by rfranzke

Loading

timuthy left a comment •

edited

Loading