🧹 Cleanup some `TODOs` #10220

rfranzke · 2024-07-29T13:11:30Z

How to categorize this PR?

/area dev-productivity
/kind cleanup

What this PR does / why we need it:

Drop deletion of deprecated allow-to-shoot-networks NetworkPolicy (part of [provider-local] Harmonize local VPN setup with real-world scenario #9752, released with v1.96.0)
Drop fetching extension observability configs with deprecated/legacy method (part of [GEP-19] Migrate shoot Prometheus deployment #9695, released with v1.95.0)
Drop Prometheus/Alertmanager migration coding (part of [GEP-19] Migrate shoot Prometheus deployment #9695, released with v1.95.0)
Drop deprecated .spec.pools[].userData from extensions.gardener.cloud/v1alpha1.Worker API (part of Introduce .spec.pools[].userDataSecretRef to prevent inlining the entire user data #9722, released with v1.95.0)
Drop OSC hash migration Secret creation (part of Introduce secret to track hash version used by OperatingSystemConfig #9846, released with v1.97.0)
Drop OSC hash assertion from upgrade tests (part of Add new WorkerPoolHash calculation to rotate nodes on OSCKey change #9865, released with v1.98.0)
Drop removal code of HVPA resources (part of Drop HVPA for KCM and use VPA instead #9698, released with v1.95.0)

/cc @ScheererJ @MichaelEischer
FYI @istvanballok @andrerun

Release note:

The legacy method of providing monitoring configuration via `ConfigMap`s labeled with `extensions.gardener.cloud/configuration=monitoring` has been removed. See [this](https://github.com/gardener/gardener/blob/master/docs/extensions/logging-and-monitoring.md#monitoring) instead.

gardener-prow · 2024-07-29T13:11:34Z

@rfranzke: GitHub didn't allow me to request PR reviews from the following users: MichaelEischer.

Note that only gardener members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

How to categorize this PR?

/area dev-productivity
/kind cleanup

What this PR does / why we need it:

Drop deletion of deprecated allow-to-shoot-networks NetworkPolicy (part of [provider-local] Harmonize local VPN setup with real-world scenario #9752, released with v1.96.0)

Drop fetching extension observability configs with deprecated/legacy method (part of [GEP-19] Migrate shoot Prometheus deployment #9695, released with v1.95.0)

Drop Prometheus/Alertmanager migration coding (part of [GEP-19] Migrate shoot Prometheus deployment #9695, released with v1.95.0)

Drop deprecated .spec.pools[].userData from extensions.gardener.cloud/v1alpha1.Worker API (part of Introduce .spec.pools[].userDataSecretRef to prevent inlining the entire user data #9722, released with v1.95.0)

Drop OSC hash migration Secret creation (part of Introduce secret to track hash version used by OperatingSystemConfig #9846, released with v1.97.0)

Drop OSC hash assertion from upgrade tests (part of Add new WorkerPoolHash calculation to rotate nodes on OSCKey change #9865, released with v1.98.0)

Drop removal code of HVPA resources (part of Drop HVPA for KCM and use VPA instead #9698, released with v1.95.0)

/cc @ScheererJ @MichaelEischer
FYI @istvanballok

Release note:
The deprecated field `.spec.pools[].userData` has been removed from the `extensions.gardener.cloud/v1alpha1.Worker` API. Use `.spec.pools[].userDataSecretRef` instead.
The legacy method of providing monitoring configuration via `ConfigMap`s labeled with `extensions.gardener.cloud/configuration=monitoring` has been removed. See [this](https://github.com/gardener/gardener/blob/master/docs/extensions/logging-and-monitoring.md#monitoring) instead.

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.

ScheererJ · 2024-07-30T10:41:53Z

/assign

ScheererJ

Thanks a lot for cleaning up 🧹.

/lgtm

gardener-prow · 2024-07-30T10:55:50Z

LGTM label has been added.

Git tree hash: 0215b877bd0acf78b6fef47f84cc5547feb53aef

ialidzhikov · 2024-07-30T11:29:23Z

/assign

MichaelEischer · 2024-07-30T12:56:17Z

/lgtm Thanks for the cleanup!

ialidzhikov · 2024-07-31T06:29:35Z

Sorry for the delay on my review, I am now checking the PR.

(part of gardener#9752, released with `v1.96.0`)

…method (part of gardener#9695, released with `v1.95.0`)

(part of gardener#9695, released with `v1.95.0`)

…oud/v1alpha1.Worker` API (part of gardener#9722, released with `v1.95.0`)

(part of gardener#9846, released with `v1.97.0`)

(part of gardener#9865, released with `v1.98.0`)

(part of gardener#9698, released with `v1.95.0`)

ialidzhikov · 2024-07-31T06:38:03Z

docs/extensions/logging-and-monitoring.md

@@ -319,78 +319,6 @@ data:
  my-custom-dashboard.json: <dashboard-JSON-document>
 ```

-#### Legacy Method of Providing Observability Configuration


FYI @vpnachev there is still no release of the shoot-lakom-service that includes gardener/gardener-extension-shoot-lakom-service#87. I assume this cleanup commit will break the monitoring config provided by the extension. You may want to kick off a new release process for the shoot-lakom-service to prevent that.

pkg/component/shared/prometheus.go

ialidzhikov

/lgtm
code-wise but I am not sure about #10220 (comment), whether we should proceed with having in mind that it will break an extension. Maybe @vpnachev can share whether he will make it in 1-2 weeks to cut a new shoot-lakom-service release?

gardener-prow · 2024-07-31T07:38:39Z

LGTM label has been added.

Git tree hash: 6611bf1667d4c56122c0c8b96056576b89885d90

rfranzke · 2024-07-31T08:19:18Z

/lgtm code-wise but I am not sure about #10220 (comment), whether we should proceed with having in mind that it will break an extension. Maybe @vpnachev can share whether he will make it in 1-2 weeks to cut a new shoot-lakom-service release?

We had such cases in the past. I don't think this model scales (= we/core checks if all extensions have been adapted accordingly, otherwise core is blocked with moving forward). It does not even work with extensions outside of this GitHub org which we are not aware of. Yes, we can consider extensions in this GitHub org as "special", but I don't think it's a very neat approach.

We already use 6 releases (=12 weeks) of deprecation before we finally remove something that could affect extensions. This should be enough time to click the release buttons. If all this doesn't work, we should rather consider moving extensions back in-tree to have the control and flexibility we want.

TL;DR: I propose @vpnachev uses this and next week (before v1.101 gets released) to click the release button, such that we can proceed with this PR and the removal timelines.

vpnachev · 2024-07-31T11:39:08Z

Thanks for the heads up!
I was planning to release a new version of lakom after we implement one improvement in the following weeks, but obviously now the plan will be changed and I will do it now.

We already use 6 releases (=12 weeks) of deprecation before we finally remove something that could affect extensions. This should be enough time to click the release buttons.

You are right, however components that can be considered feature complete and not under active development should not be expected to be released often.

ialidzhikov

I was planning to release a new version of lakom after we implement one improvement in the following weeks, but obviously now the plan will be changed and I will do it now.

Thanks! I am approving then
/approve

gardener-prow · 2024-07-31T13:35:22Z

[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

rfranzke · 2024-07-31T13:36:08Z

Thanks colleagues, appreciated!

…ner.cloud/v1alpha1.Worker` API" (#10285) * Revert "Drop deprecated `.spec.pools[].userData` from `extensions.gardener.cloud/v1alpha1.Worker` API" This reverts commit 33c2143. Part of #10220 * Increase removal deadline to v1.104

…dener.cloud/v1alpha1.Worker` API" This reverts commit 33c2143. Part of gardener#10220

…`extensions.gardener.cloud/v1alpha1.Worker` API" (#10289) * Revert "Drop deprecated `.spec.pools[].userData` from `extensions.gardener.cloud/v1alpha1.Worker` API" This reverts commit 33c2143. Part of #10220 * Increase removal deadline to v1.104 --------- Co-authored-by: rfranzke <rafael.franzke@sap.com>

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

gardener-prow bot requested a review from ScheererJ July 29, 2024 13:11

gardener-prow bot added the area/dev-productivity Developer productivity related (how to improve development) label Jul 29, 2024

gardener-prow bot added kind/cleanup Something that is not needed anymore and can be cleaned up size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 29, 2024

rfranzke mentioned this pull request Jul 29, 2024

Gardener fails to create shoots with > ~80 worker pools #9545

Closed

8 tasks

gardener-prow bot added cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. and removed cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. labels Jul 29, 2024

rfranzke force-pushed the cleanup/todos branch from da84acd to bc78dbe Compare July 29, 2024 13:38

gardener-prow bot assigned ScheererJ Jul 30, 2024

ScheererJ reviewed Jul 30, 2024

View reviewed changes

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

gardener-prow bot assigned ialidzhikov Jul 30, 2024

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

rfranzke added 7 commits July 31, 2024 08:42

Drop deletion of deprecated allow-to-shoot-networks NetworkPolicy

fd4966c

(part of gardener#9752, released with `v1.96.0`)

Drop fetching extension observability configs with deprecated/legacy …

905b5ee

…method (part of gardener#9695, released with `v1.95.0`)

Drop Prometheus/Alertmanager migration coding

8413cf8

(part of gardener#9695, released with `v1.95.0`)

Drop deprecated .spec.pools[].userData from `extensions.gardener.cl…

33c2143

…oud/v1alpha1.Worker` API (part of gardener#9722, released with `v1.95.0`)

Drop OSC hash migration Secret creation

f20ca05

(part of gardener#9846, released with `v1.97.0`)

Drop OSC hash assertion from upgrade tests

5884ac0

(part of gardener#9865, released with `v1.98.0`)

Drop removal code of HVPA resources

0bc6daa

(part of gardener#9698, released with `v1.95.0`)

rfranzke force-pushed the cleanup/todos branch from bc78dbe to 0bc6daa Compare July 31, 2024 06:43

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

gardener-prow bot requested a review from ialidzhikov July 31, 2024 06:43

gardener-prow bot requested a review from ScheererJ July 31, 2024 06:43

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

ialidzhikov reviewed Jul 31, 2024

View reviewed changes

Address PR review feedback

0985fe1

rfranzke requested a review from ialidzhikov July 31, 2024 07:19

ialidzhikov reviewed Jul 31, 2024

View reviewed changes

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

ialidzhikov reviewed Jul 31, 2024

View reviewed changes

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

gardener-prow bot merged commit db06a3a into gardener:master Jul 31, 2024
19 checks passed

rfranzke deleted the cleanup/todos branch August 1, 2024 06:31

rfranzke mentioned this pull request Aug 8, 2024

Revert "Drop deprecated .spec.pools[].userData from extensions.gardener.cloud/v1alpha1.Worker API" #10285

Merged

gardener-ci-robot pushed a commit to gardener-ci-robot/gardener that referenced this pull request Aug 8, 2024

Revert "Drop deprecated .spec.pools[].userData from `extensions.gar…

a27950a

…dener.cloud/v1alpha1.Worker` API" This reverts commit 33c2143. Part of gardener#10220

rfranzke mentioned this pull request Aug 9, 2024

📖 Update version skew policy, add developer guide for deprecations and backwards-compatibility #10294

Merged

plkokanov mentioned this pull request Sep 26, 2024

Re-allow gardenlet to patch PersistentVolumes #10577

Merged

🧹 Cleanup some TODOs #10220

🧹 Cleanup some TODOs #10220

Uh oh!

Conversation

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

Uh oh!

Uh oh!

gardener-prow bot commented Jul 29, 2024

Uh oh!

ScheererJ commented Jul 30, 2024

Uh oh!

ScheererJ left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jul 30, 2024

Uh oh!

ialidzhikov commented Jul 30, 2024

Uh oh!

MichaelEischer commented Jul 30, 2024

Uh oh!

ialidzhikov commented Jul 31, 2024

Uh oh!

ialidzhikov Jul 31, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jul 31, 2024

Uh oh!

rfranzke commented Jul 31, 2024

Uh oh!

vpnachev commented Jul 31, 2024

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jul 31, 2024

Uh oh!

rfranzke commented Jul 31, 2024

Uh oh!

Uh oh!

Uh oh!

🧹 Cleanup some `TODOs` #10220

🧹 Cleanup some `TODOs` #10220

rfranzke commented Jul 29, 2024 •

edited

Loading