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

LucaBernstein · 2025-04-04T08:40:13Z

How to categorize this PR?
/area usability
/kind cleanup enhancement

What this PR does / why we need it:
As we introduced shoot.spec.cloudProfile to support NamespacedCloudProfile references, the field shoot.spec.cloudProfileName is discouraged to use in favor of the newer and more flexible replacement shoot.spec.cloudProfile.name.
Since Gardener v1.101.0, a synchronization mechanism ensures that both fields are filled by the other value if empty and the referenced cloud profile is of kind CloudProfile.

Starting with Shoots of Kubernetes version v1.33 there will be a warning printed for clients creating and updating Shoots that still have the field .spec.cloudProfileName set.
Starting with Shoots of Kubernetes version v1.34 the creation of new Shoots will be blocked, if the field .spec.cloudProfileName is filled. For existing Shoots still having both fields filled the .spec.cloudProfileName field will be dropped once.

Example:

spec:
  cloudProfile:
    name: local
  # kind: CloudProfile # optional, defaults to 'CloudProfile'

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

Special notes for your reviewer:
/cc @timuthy @rfranzke

Waiting for next dashboard release with included support for .spec.cloudProfile field: Support Shoot.spec.cloudProfile dashboard#2427 → Update dependency gardener/dashboard to v1.81.0 #12510

Release note:

Starting with Kubernetes v1.33, there are API warnings for Shoots that have the `.spec.cloudProfileName` field set. Users are advised to drop this field and specify the cloud profile using the `.spec.cloudProfile.name` field instead.

Starting with Kubernetes v1.34, setting the field `.spec.cloudProfileName` is forbidden. The field will be dropped from existing Shoots once. Users are advised to drop this field and specify the cloud profile using the `.spec.cloudProfile.name` field instead.

pkg/api/core/shoot/warnings.go

plugin/pkg/utils/cloudprofile.go

LucaBernstein · 2025-04-08T09:18:04Z

Build [local-skaffold/gardener-extension-provider-local-node] failed: docker build failure: failed to set up container networking: failed to add interface veth130ffda to sandbox: check bridge port state: bridge port not forwarding after 200ms. Please fix the Dockerfile and try again..

Occurrence of #11511 .

/test pull-gardener-e2e-kind-ha-multi-zone-upgrade

rfranzke

Please maintain https://github.com/gardener/gardener/blob/master/docs/usage/shoot/shoot_kubernetes_versions.md

rfranzke

/lgtm

gardener-prow · 2025-04-09T12:27:55Z

LGTM label has been added.

Git tree hash: 2c9a87f5b3f357d29f36619b159d92bb7c59e370

timuthy

As sent via chat, the deprecation (sync stop) might be too early if the gardener-dashboard doesn't use the new spec.cloudProfile field.

Let's hold for a while and discuss this prerequisite.
/hold

timuthy · 2025-04-15T13:39:40Z

We agreed on waiting for the dashboard to adapt to the new spec.cloudProfile field, see gardener/dashboard#1971.

The PR is blocked until then.

Add tests, including missing test for ConstraintK8sLess133.

… v1.33 on.

…e types.

… >= v1.34. - Starting with k8s v1.33, no more syncing back to empty cloudProfileName fields happens. - Starting with k8s v1.34, no more syncing back and forth between cloudProfileName and cloudProfile.Name fields happens. The only exception is that during a shoot update the cloudProfileName field is once set empty, if it does not conflict with the cloudProfile. Refactor test CloudProfile(Name) field access

…rting with k8s v1.43

- Improve warning phrase - Use named import alias `v1beta1constants`

Signed-off-by: Luca Bernstein <luca.bernstein@sap.com>

LucaBernstein · 2025-07-11T06:45:54Z

#12510 has been opened including the latest dashboard release with .spec.cloudProfile field support.
/unhold

ialidzhikov · 2025-07-11T06:46:33Z

pkg/apis/core/validation/shoot.go

+	if k8sVersion != nil && versionutils.ConstraintK8sGreaterEqual134.Check(k8sVersion) && ptr.Deref(cloudProfileName, "") != "" {
+		allErrs = append(allErrs, field.Forbidden(fldPath.Child("cloudProfileName"), "starting with k8s v1.34, cloudProfileName must not be set. Instead, use spec.cloudProfile.name"))
+	}


You have to adapt the maintenance controller when doing forceful upgrade from 1.33 -> 1.34 to migration from spec.cloudProfileName to .spec.cloudProfile.name. Examples: #12413 and #12343

Thank you! I adapted the maintenance controller to drop the .spec.cloudProfileName field upon forceful upgrade. (Field synchronization is in place since g/g v1.101.0.)

When checking the PR in more depth, I see that there is already a logic in gardener-apiserver to set .spec.cloudProfileName to nil if .spec.cloudProfile.name is already set (it should be set based on the already existing logic for syncing both of the fields).

This makes me think that there is no need of extra coding in the maintenance controller as due to the above-mentioned logic the gardener-apiserver wouldn't fail an update from K8s 1.33 to 1.34.

I am letting to you to confirm/reject this. I am sorry for my suggestion if there was actually no need of the custom coding in the maintenance controller. 🙈

You could revert 5b1a680 if we don't need it.

Added revert commit to undo the last commit. Thanks for checking in-depth again. 👍

…nil` upon a forceful upgrade from k8s `< v1.34` to `>= v1.34`. Signed-off-by: Luca Bernstein <luca.bernstein@sap.com>

ialidzhikov · 2025-07-16T09:51:58Z

/assign

ialidzhikov

Only 1 comment (ref #11816 (comment)), otherwise lgtm

…me` to `nil` upon a forceful upgrade from k8s `< v1.34` to `>= v1.34`." This reverts commit 5b1a680.

ialidzhikov

/lgtm

gardener-prow · 2025-07-22T06:29:11Z

LGTM label has been added.

Git tree hash: 76cc1d3ecda7bc12f2dc5c04eaf1f64bb5aec389

gardener-prow · 2025-07-22T06:29:14Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ialidzhikov

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~~ [ialidzhikov]

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

gardener-prow bot requested review from rfranzke and timuthy April 4, 2025 08:40

LucaBernstein mentioned this pull request Apr 4, 2025

☂️ [GEP-25] Introduce NamespacedCloudProfiles #9504

Open

45 tasks

rfranzke reviewed Apr 8, 2025

View reviewed changes

pkg/api/core/shoot/warnings.go Outdated Show resolved Hide resolved

plugin/pkg/utils/cloudprofile.go Outdated Show resolved Hide resolved

LucaBernstein force-pushed the nscpfl-deprecate-cloudprofile branch from ca854aa to 9d1e799 Compare April 8, 2025 08:43

LucaBernstein requested a review from rfranzke April 8, 2025 08:43

gardener deleted a comment from gardener-prow bot Apr 8, 2025

rfranzke reviewed Apr 9, 2025

View reviewed changes

gardener-prow bot assigned rfranzke Apr 9, 2025

gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2025

timuthy reviewed Apr 9, 2025

View reviewed changes

gardener-prow bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 9, 2025

gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2025

gardener-prow bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label May 2, 2025

LucaBernstein force-pushed the nscpfl-deprecate-cloudprofile branch from ab1e4fe to 2fe8c91 Compare May 2, 2025 12:55

gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label May 2, 2025

gardener-prow bot requested a review from rfranzke May 2, 2025 12:55

gardener-prow bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 2, 2025

gardener-prow bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels May 17, 2025

LucaBernstein added 8 commits July 10, 2025 10:51

Add Kubernetes version constraints for < | >= v1.34

9230d9b

Add tests, including missing test for ConstraintK8sLess133.

Add warnings for non-empty shoot.spec.cloudProfileName field from k8s…

9962bf8

… v1.33 on.

Add note of upcoming changes to CloudProfileName field handling to th…

c2705e7

…e types.

Adapt validation to error on shoot spec with cloudProfileName set sta…

12b9c4f

…rting with k8s v1.43

[make generate]

b98d014

Address review comments

52322d6

- Improve warning phrase - Use named import alias `v1beta1constants`

Add documentation to shoot_kubernetes_versions.md

79fe476

LucaBernstein force-pushed the nscpfl-deprecate-cloudprofile branch from 6b8a7f7 to 94f3136 Compare July 10, 2025 08:59

Improve error message

89a175d

Signed-off-by: Luca Bernstein <luca.bernstein@sap.com>

LucaBernstein force-pushed the nscpfl-deprecate-cloudprofile branch from 94f3136 to 89a175d Compare July 10, 2025 09:25

gardener-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 11, 2025

ialidzhikov requested changes Jul 11, 2025

View reviewed changes

gardener-prow bot assigned ialidzhikov Jul 11, 2025

Adapt the maintenance controller to set .spec.cloudProfileName to `…

5b1a680

…nil` upon a forceful upgrade from k8s `< v1.34` to `>= v1.34`. Signed-off-by: Luca Bernstein <luca.bernstein@sap.com>

LucaBernstein requested a review from ialidzhikov July 14, 2025 10:56

ialidzhikov mentioned this pull request Jul 18, 2025

Update wording in the Shoot Kubernetes Minor Version Upgrades guide #12558

Merged

ialidzhikov reviewed Jul 18, 2025

View reviewed changes

Revert "Adapt the maintenance controller to set `.spec.cloudProfileNa…

f5f66cb

…me` to `nil` upon a forceful upgrade from k8s `< v1.34` to `>= v1.34`." This reverts commit 5b1a680.

LucaBernstein requested a review from ialidzhikov July 22, 2025 06:13

ialidzhikov approved these changes Jul 22, 2025

View reviewed changes

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

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

gardener-prow bot merged commit 48f2e5d into gardener:master Jul 22, 2025
19 checks passed

LucaBernstein deleted the nscpfl-deprecate-cloudprofile branch July 22, 2025 13:45

timebertt mentioned this pull request Jul 30, 2025

Replace deprecated Shoot.spec.cloudProfileName stackitcloud/gardener-extension-shoot-flux#172

Merged

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

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

Uh oh!

Conversation

LucaBernstein commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LucaBernstein commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rfranzke left a comment

Choose a reason for hiding this comment

Uh oh!

rfranzke left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Apr 9, 2025

Uh oh!

timuthy left a comment

Choose a reason for hiding this comment

Uh oh!

timuthy commented Apr 15, 2025

Uh oh!

LucaBernstein commented Jul 11, 2025

Uh oh!

ialidzhikov Jul 11, 2025 • 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!

LucaBernstein Jul 11, 2025

Choose a reason for hiding this comment

Uh oh!

ialidzhikov Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

LucaBernstein Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

ialidzhikov commented Jul 16, 2025

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jul 22, 2025

Uh oh!

gardener-prow bot commented Jul 22, 2025

Uh oh!

Uh oh!

Uh oh!

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

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

LucaBernstein commented Apr 4, 2025 •

edited

Loading

LucaBernstein commented Apr 8, 2025 •

edited

Loading

ialidzhikov Jul 11, 2025 •

edited

Loading