Remove init container and annotation used for Prometheus volume cleanup migration #12728
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Skipping CI for Draft Pull Request. |
674d8c9 to
64b506e
Compare
64b506e to
7018c08
Compare
7018c08 to
4b16e43
Compare
There was a problem hiding this comment.
We are considering to prepare the commits differently,
- first revert #12219 entirely, and
- then readd the pieces that need to be retained.
That approach will show in the diff the things that "stay", i.e. things that could be reviewed, and not the things that are deleted.
This will allow the reviewer to find things that might be deleted in addition - an aspect that is not obvious in the current representation.
gardener#12219)" This reverts commit 3b6c17c. The Prometheus annotations added in the original commit are not automatically removed by this revert. There will be a follow up commit to remove them. git fetch origin pull/12219/head # d1e7cd5 git fetch origin pull/12728/head # 4b16e43 gitk HEAD 4b16e43 d1e7cd5 ^3b6c17c808^ -- $(git log --oneline -1 --numstat 3b6c17c | tail -n +2 | awk '{print $3}') Conflicts: cmd/gardenlet/app/migration.go Resolve conflicts manually by removing the function definition and function call that was added in the original PR. pkg/apis/resources/v1alpha1/types.go Manual conflict resolution. pkg/component/observability/monitoring/prometheus/component.go Manual conflict resolution. pkg/component/observability/monitoring/prometheus/prometheus.go Manual conflict resolution. Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
This commit introduces a new migration step during the gardenlet startup to remove the Prometheus annotation used in the previous migration step to mark it as cleaned up. Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
4b16e43 to
19997df
Compare
|
LGTM label has been added. Git tree hash: a9b8c02c7382fd9375e03f4aa223df187c12c1f6
|
rfranzke
reviewed
Aug 20, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: istvanballok, rfranzke 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:
Approvers can indicate their approval by writing |
Duciwuci
pushed a commit
to stackitcloud/gardener
that referenced
this pull request
Sep 1, 2025
…up migration (gardener#12728) * Revert "Clean up obsolete `prometheus-` folder from Prometheus volumes (gardener#12219)" This reverts commit 3b6c17c. The Prometheus annotations added in the original commit are not automatically removed by this revert. There will be a follow up commit to remove them. git fetch origin pull/12219/head # d1e7cd5 git fetch origin pull/12728/head # 4b16e43 gitk HEAD 4b16e43 d1e7cd5 ^3b6c17c808^ -- $(git log --oneline -1 --numstat 3b6c17c | tail -n +2 | awk '{print $3}') Conflicts: cmd/gardenlet/app/migration.go Resolve conflicts manually by removing the function definition and function call that was added in the original PR. pkg/apis/resources/v1alpha1/types.go Manual conflict resolution. pkg/component/observability/monitoring/prometheus/component.go Manual conflict resolution. pkg/component/observability/monitoring/prometheus/prometheus.go Manual conflict resolution. Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com> * Remove Prometheus annotation from gardenlet startup This commit introduces a new migration step during the gardenlet startup to remove the Prometheus annotation used in the previous migration step to mark it as cleaned up. Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com> --------- Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to categorize this PR?
/area monitoring
/kind enhancement
What this PR does / why we need it:
We recently identified that certain Prometheus volumes still contain the
prometheus-folder with outdated Prometheus data. The following PR, with further details, addressed this issue by implementing a cleanup process:prometheus-folder from Prometheus volumes #12219The cleanup code introduced a new init container in the Prometheus resource. For the garden, longterm, aggregate, cache, and seed Prometheus, this init container was added directly to the Prometheus resource. In the case of shoot Prometheus, where successful shoot reconciliation can't be guaranteed, the init container was temporarily added to each shoot Prometheus resource as a one-time migration during the gardenlet startup. Successfully cleaned up shoot Prometheus were annotated to prevent repeated execution of this cleanup process during gardenlet startup.
Now, after three Gardener releases, it is time to drop this init container and annotation from the Prometheus resources and eliminate as much of the migration code as possible.
Special notes for your reviewer:
/cc @istvanballok @rfranzke
Release note: