Rename `seed.gardener.cloud/` prefix to `name.seed.gardener.cloud/` #11479

rfranzke · 2025-02-21T08:44:16Z

due to potential naming conflicts when users also use seed.gardener.cloud/ as prefix for their labels (not ideal, they should actually use a unique prefix (e.g., seed.my.cool.domain.com/), but we cannot prevent it for historic reasons

How to categorize this PR?

/area usability
/kind regression

What this PR does / why we need it:
This PR renames the seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ due to potential naming conflicts when users also useseed.gardener.cloud/ as prefix for their labels (not ideal, they should actually use a unique prefix (e.g., seed.my.cool.domain.com/), but we cannot prevent it for historic reasons.

Which issue(s) this PR fixes:
Follow-up of #11062

Special notes for your reviewer:
/cc @marc1404

Release note:

A bug which prevented usage of labels with `seed.gardener.cloud/` prefix on `Seed`, `ManagedSeed`, `BackupEntry`, and `Shoot` resources has been fixed.

All `Seed`s are now automatically labeled with `name.seed.gardener.cloud/<name>=true` (⚠ no longer `seed.gardener.cloud/<name>=true`) where `<name>` is their own name, and (if applicable) the name of their parent seed in case they are managed seeds. This label can be used as selector for requests.

rfranzke · 2025-02-21T08:44:26Z

/cherry-pick release-v1.113

rfranzke · 2025-02-21T08:44:27Z

/cherry-pick release-v1.112

rfranzke · 2025-02-21T08:44:29Z

/cherry-pick release-v1.111

gardener-ci-robot · 2025-02-21T08:44:30Z

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.113 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.113

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

gardener-ci-robot · 2025-02-21T08:44:31Z

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.112 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.112

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

gardener-ci-robot · 2025-02-21T08:44:31Z

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.111 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.111

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

rfranzke · 2025-02-21T08:44:31Z

/cherry-pick release-v1.110

gardener-ci-robot · 2025-02-21T08:44:36Z

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.110 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.110

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

plkokanov

Could you also update the docs https://github.com/gardener/gardener/blob/master/docs/concepts/apiserver-admission-plugins.md#seedmutator with the new label name

And this comment

gardener/pkg/utils/gardener/identity.go

Line 106 in b2d9d5b

    
           // MaintainSeedNameLabels maintains the seed.gardener.cloud/<name>=true labels on the given object.

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

due to potential naming conflicts when users also use `seed.gardener.cloud/` as prefix for their labels (not ideal, they should actually use a unique prefix (e.g., `seed.my.cool.domain.com/`), but we cannot prevent it for historic reasons

marc1404

/lgtm

Thank you! 🙏

It works in my local setup after upgrading Gardener Seed, Shoot, ManagedSeed, and BackupEntry have both seed.gardener.cloud/* and name.seed.gardener.cloud/* labels.

gardener-prow · 2025-02-21T10:36:37Z

LGTM label has been added.

Git tree hash: a723e4426e04f5fc14d64cc5c67a0cfc8748311c

plkokanov

/lgtm
/approve

gardener-prow · 2025-02-21T12:49:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: plkokanov

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

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

plkokanov · 2025-02-21T12:51:58Z

It works in my local setup after upgrading Gardener Seed, Shoot, ManagedSeed, and BackupEntry have both seed.gardener.cloud/* and name.seed.gardener.cloud/* labels.

Same behaviour also in my local setup with multiple seeds.

gardener-ci-robot · 2025-02-21T14:48:32Z

@rfranzke: new pull request created: #11485

In response to this:

/cherry-pick release-v1.113

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

gardener-ci-robot · 2025-02-21T14:49:14Z

@rfranzke: new pull request created: #11486

In response to this:

/cherry-pick release-v1.112

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

gardener-ci-robot · 2025-02-21T14:49:52Z

@rfranzke: #11479 failed to apply on top of branch "release-v1.111":

Applying: Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`
Using index info to reconstruct a base tree...
M	cmd/gardenlet/app/app.go
M	pkg/apis/core/v1beta1/constants/types_constants.go
M	pkg/apiserver/registry/core/shoot/strategy_test.go
M	plugin/pkg/managedseed/validator/admission_test.go
A	plugin/pkg/seed/mutator/admission_test.go
M	test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_test.go
CONFLICT (modify/delete): plugin/pkg/seed/mutator/admission_test.go deleted in HEAD and modified in Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`. Version Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/` of plugin/pkg/seed/mutator/admission_test.go left in tree.
Auto-merging plugin/pkg/managedseed/validator/admission_test.go
CONFLICT (content): Merge conflict in plugin/pkg/managedseed/validator/admission_test.go
Auto-merging pkg/apiserver/registry/core/shoot/strategy_test.go
Auto-merging pkg/apis/core/v1beta1/constants/types_constants.go
Auto-merging cmd/gardenlet/app/app.go
CONFLICT (content): Merge conflict in cmd/gardenlet/app/app.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`

In response to this:

/cherry-pick release-v1.111

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

gardener-ci-robot · 2025-02-21T14:50:27Z

@rfranzke: #11479 failed to apply on top of branch "release-v1.110":

Applying: Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`
Using index info to reconstruct a base tree...
M	cmd/gardenlet/app/app.go
M	pkg/apis/core/v1beta1/constants/types_constants.go
M	pkg/apiserver/registry/core/shoot/strategy_test.go
M	plugin/pkg/managedseed/validator/admission_test.go
A	plugin/pkg/seed/mutator/admission_test.go
M	test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_test.go
CONFLICT (modify/delete): plugin/pkg/seed/mutator/admission_test.go deleted in HEAD and modified in Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`. Version Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/` of plugin/pkg/seed/mutator/admission_test.go left in tree.
Auto-merging plugin/pkg/managedseed/validator/admission_test.go
CONFLICT (content): Merge conflict in plugin/pkg/managedseed/validator/admission_test.go
Auto-merging pkg/apiserver/registry/core/shoot/strategy_test.go
Auto-merging pkg/apis/core/v1beta1/constants/types_constants.go
Auto-merging cmd/gardenlet/app/app.go
CONFLICT (content): Merge conflict in cmd/gardenlet/app/app.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/`

In response to this:

/cherry-pick release-v1.110

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

…er.cloud/` prefix to `name.seed.gardener.cloud/` (#11499) * Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/` due to potential naming conflicts when users also use `seed.gardener.cloud/` as prefix for their labels (not ideal, they should actually use a unique prefix (e.g., `seed.my.cool.domain.com/`), but we cannot prevent it for historic reasons * Migration code in GCM to re-compute seed labels * Address PR review feedback * Do not label managedseeds and seeds --------- Co-authored-by: rfranzke <rafael.franzke@sap.com>

…er.cloud/` prefix to `name.seed.gardener.cloud/` (#11492) * Rename `seed.gardener.cloud/` prefix to `.name.seed.gardener.cloud/` due to potential naming conflicts when users also use `seed.gardener.cloud/` as prefix for their labels (not ideal, they should actually use a unique prefix (e.g., `seed.my.cool.domain.com/`), but we cannot prevent it for historic reasons * Migration code in GCM to re-compute seed labels * Address PR review feedback * Do not label managedseeds and seeds --------- Co-authored-by: rfranzke <rafael.franzke@sap.com>

gardener#11479, released with `v1.114.0`

* Cleanup migration logic for e2e upgrade tests From #11593, released with `v1.115.0` * Filter {Managed}Seeds in gardenlet on manager.Manager level #11479, released with `v1.114.0` * No longer generate empy `Secret` for `reconcile` OSC #11004, released with `v1.111.0`

* Cleanup migration logic for e2e upgrade tests From gardener#11593, released with `v1.115.0` * Filter {Managed}Seeds in gardenlet on manager.Manager level gardener#11479, released with `v1.114.0` * No longer generate empy `Secret` for `reconcile` OSC gardener#11004, released with `v1.111.0`

gardener-prow bot requested a review from marc1404 February 21, 2025 08:44

gardener-prow bot added area/usability Usability related kind/regression Bug that hit us already in the past and that is reappearing/requires a proper solution cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Feb 21, 2025

gardener-prow bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 21, 2025

marc1404 changed the title ~~Rename seed.gardener.cloud/ prefix to .name.seed.gardener.cloud/~~ Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ Feb 21, 2025

rfranzke force-pushed the fix/seed-name-prefix branch 2 times, most recently from 84e5c43 to f17b83d Compare February 21, 2025 09:12

plkokanov requested changes Feb 21, 2025

View reviewed changes

pkg/apis/core/v1beta1/constants/types_constants.go Outdated Show resolved Hide resolved

gardener-prow bot assigned plkokanov Feb 21, 2025

rfranzke added 3 commits February 21, 2025 11:16

Migration code in GCM to re-compute seed labels

d139f57

Address PR review feedback

eee6057

rfranzke force-pushed the fix/seed-name-prefix branch from f17b83d to eee6057 Compare February 21, 2025 10:24

marc1404 reviewed Feb 21, 2025

View reviewed changes

gardener-prow bot assigned marc1404 Feb 21, 2025

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

plkokanov reviewed Feb 21, 2025

View reviewed changes

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

gardener-prow bot merged commit 98696af into gardener:master Feb 21, 2025
18 of 19 checks passed

gardener-ci-robot mentioned this pull request Feb 21, 2025

[release-v1.113] Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11485

Merged

gardener-ci-robot mentioned this pull request Feb 21, 2025

[release-v1.112] Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11486

Merged

rfranzke deleted the fix/seed-name-prefix branch February 21, 2025 14:54

This was referenced Feb 24, 2025

[release-v1.111] Automated cherry pick of #11479: Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11492

Merged

[release-v1.110] Automated cherry pick of #11479: Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11499

Merged

rfranzke added a commit to rfranzke/gardener that referenced this pull request Mar 31, 2025

Filter {Managed}Seeds in gardenlet on manager.Manager level

fd5d3cc

gardener#11479, released with `v1.114.0`

rfranzke mentioned this pull request Mar 31, 2025

🧹 Cleanup a few TODOs #11773

Merged

rfranzke added a commit to rfranzke/gardener that referenced this pull request Mar 31, 2025

Filter {Managed}Seeds in gardenlet on manager.Manager level

af4f291

gardener#11479, released with `v1.114.0`

rfranzke added a commit to rfranzke/gardener that referenced this pull request Apr 1, 2025

Filter {Managed}Seeds in gardenlet on manager.Manager level

d19cb61

gardener#11479, released with `v1.114.0`

Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11479

Rename seed.gardener.cloud/ prefix to name.seed.gardener.cloud/ #11479

Uh oh!

Conversation

rfranzke commented Feb 21, 2025

Uh oh!

rfranzke commented Feb 21, 2025

Uh oh!

rfranzke commented Feb 21, 2025

Uh oh!

rfranzke commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

rfranzke commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

plkokanov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

marc1404 left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Feb 21, 2025

Uh oh!

plkokanov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Feb 21, 2025

Uh oh!

plkokanov commented Feb 21, 2025

Uh oh!

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

gardener-ci-robot commented Feb 21, 2025

Uh oh!

Uh oh!

Rename `seed.gardener.cloud/` prefix to `name.seed.gardener.cloud/` #11479

Rename `seed.gardener.cloud/` prefix to `name.seed.gardener.cloud/` #11479