[GEP-28] Prepare `Shoot` control plane namespace to be different from its technical ID #11382

rfranzke · 2025-02-13T15:35:38Z

How to categorize this PR?

/area ipcei
/kind enhancement

What this PR does / why we need it:

Rename Shoot.SeedNamespace to Shoot.ControlPlaneNamespace
to make it very clear for the autonomous case
in the future, this is no longer necessarily the same as the technical ID of the shoot (at least for ASCs)
Introduce .spec.provider.workers[].controlPlane in Shoot API
- in order to mark a Shoot as "autonomous", there must be exactly one pool that sets the controlPlane field
- currently, it's not allowed to set this (we are not there yet)
- for gardenadm bootstrapping, the Shoot manifest is read via file, i.e., validation is not called (at least for now, otherwise we have to introduce a feature gate, let's see how it goes)
Streamline usages of .status.technicalID
Improve client map and drop legacy secret handling
- gardenlet and gardener-operator always run in the cluster like garden/shoot, so there is no need to make a DNS lookup
- they can always use the cluster-internal kubeconfig

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

Special notes for your reviewer:
/cc @timebertt @ScheererJ

Release note:

NONE

ScheererJ · 2025-02-13T16:18:16Z

/assign

timebertt · 2025-02-14T10:11:03Z

/assign

timebertt

Nice PR, only nits from my side. Otherwise lgtm

pkg/apis/core/v1beta1/helper/shoot_test.go

pkg/client/kubernetes/clientmap/garden_clientmap_test.go

pkg/client/kubernetes/clientmap/shoot_clientmap_test.go

ScheererJ

Thanks for improving the names. It will hopefully make the code easier to understand in both autonomous as well as ordinary shoot cluster scenarios.

pkg/apis/core/v1beta1/types_shoot.go

pkg/client/kubernetes/clientmap/shoot_clientmap.go

pkg/apis/core/types_shoot.go

timebertt

Thanks!
/lgtm

gardener-prow · 2025-02-17T07:26:25Z

LGTM label has been added.

Git tree hash: 5f5a26620cc31c15356acc1fab54d5a949b3e7f9

- to make it very clear for the autonomous case - in the future, this is no longer necessarily the same as the technical ID of the shoot (at least for ASCs)

- in order to mark a Shoot as "autonomous", there must be exactly one pool that sets the controlPlane field - currently, it's not allowed to set this (we are not there yet) - for gardenadm bootstrapping, the Shoot manifest is read via file, i.e., validation is not called (at least for now, otherwise we have to introduce a feature gate, let's see how it goes)

The control plane namespace for ASCs will be `kube-system`, otherwise we'll fall back to the technical ID.

or make them more clear

- gardenlet and gardener-operator always run in the cluster like garden/shoot, so there is no need to make a DNS lookup - they can always use the cluster-internal kubeconfig

ScheererJ

/lgtm
/approve

gardener-prow · 2025-02-18T08:24:15Z

LGTM label has been added.

Git tree hash: 86f9dc366abc39f2c756343aa91f5019eef1955c

gardener-prow · 2025-02-18T08:24:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ScheererJ

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

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

rfranzke · 2025-02-18T12:41:44Z

/retest

gardener-prow · 2025-02-18T12:57:47Z

@rfranzke: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-gardener-apidiff	`1376d0f`	link	false	`/test pull-gardener-apidiff`

Full PR test history. Your PR dashboard. Command help for this repository.
Please help us cut down on flakes by linking this test failure to an open flake report or filing a new flake report if you can't find an existing one. Also see our testing guideline for how to avoid and hunt flakes.

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. I understand the commands that are listed here.

gardener-prow bot requested review from ScheererJ and timebertt February 13, 2025 15:35

gardener-prow bot added area/ipcei IPCEI (Important Project of Common European Interest) kind/enhancement Enhancement, improvement, extension labels Feb 13, 2025

rfranzke mentioned this pull request Feb 13, 2025

☂️ [GEP-28] Autonomous Shoot Clusters #2906

Open

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

rfranzke force-pushed the gep28/controlplane-namespace branch from eb1d7dd to ac2f102 Compare February 13, 2025 15:37

gardener-prow bot assigned ScheererJ Feb 13, 2025

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

gardener-prow bot assigned timebertt Feb 14, 2025

timebertt reviewed Feb 14, 2025

View reviewed changes

rfranzke force-pushed the gep28/controlplane-namespace branch from ac2f102 to c995224 Compare February 14, 2025 11:00

rfranzke requested a review from timebertt February 14, 2025 11:01

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

rfranzke force-pushed the gep28/controlplane-namespace branch 2 times, most recently from 770a895 to 230a755 Compare February 14, 2025 11:28

ScheererJ reviewed Feb 14, 2025

View reviewed changes

pkg/apis/core/v1beta1/types_shoot.go Show resolved Hide resolved

pkg/client/kubernetes/clientmap/shoot_clientmap.go Outdated Show resolved Hide resolved

pkg/apis/core/types_shoot.go Outdated Show resolved Hide resolved

rfranzke requested a review from ScheererJ February 14, 2025 13:35

timebertt reviewed Feb 17, 2025

View reviewed changes

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

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

rfranzke added 5 commits February 18, 2025 09:21

Rename Shoot.SeedNamespace to Shoot.ControlPlaneNamespace

6edb36d

- to make it very clear for the autonomous case - in the future, this is no longer necessarily the same as the technical ID of the shoot (at least for ASCs)

[make generate]

c302c84

Introduce helper functions

c127ea1

The control plane namespace for ASCs will be `kube-system`, otherwise we'll fall back to the technical ID.

Streamline usages of .status.technicalID

4444c72

or make them more clear

rfranzke added 3 commits February 18, 2025 09:21

Improve client map and drop legacy secret handling

1b5d9f4

- gardenlet and gardener-operator always run in the cluster like garden/shoot, so there is no need to make a DNS lookup - they can always use the cluster-internal kubeconfig

Address PR review feedback

fb63c41

Address PR review feedback

1376d0f

rfranzke force-pushed the gep28/controlplane-namespace branch from f796187 to 1376d0f Compare February 18, 2025 08:22

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

gardener-prow bot requested a review from timebertt February 18, 2025 08:22

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

ScheererJ approved these changes Feb 18, 2025

View reviewed changes

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

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

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

rfranzke deleted the gep28/controlplane-namespace branch February 18, 2025 15:19

timebertt mentioned this pull request Feb 24, 2025

e2e: Refactor Create Hibernate Wakeup Delete Shoot test to ordered containers #11478

Merged

[GEP-28] Prepare Shoot control plane namespace to be different from its technical ID #11382

[GEP-28] Prepare Shoot control plane namespace to be different from its technical ID #11382

Uh oh!

Conversation

rfranzke commented Feb 13, 2025

Uh oh!

ScheererJ commented Feb 13, 2025

Uh oh!

timebertt commented Feb 14, 2025

Uh oh!

timebertt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ScheererJ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timebertt left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Feb 17, 2025

Uh oh!

ScheererJ left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Feb 18, 2025

Uh oh!

gardener-prow bot commented Feb 18, 2025

Uh oh!

rfranzke commented Feb 18, 2025

Uh oh!

gardener-prow bot commented Feb 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[GEP-28] Prepare `Shoot` control plane namespace to be different from its technical ID #11382

[GEP-28] Prepare `Shoot` control plane namespace to be different from its technical ID #11382

gardener-prow bot commented Feb 18, 2025 •

edited

Loading