🍒 Pick changes from release-v1.148 for ske-v1.148 - #178
Merged
Conversation
…al observability secret is synced during rotation before triggering seed reconciliation (gardener#15446) * Ensure global observability secret is synced before seed reconciliation Commit `d393a96` added rotation for the global observability ingress secret. However, it missed a race condition that is only visible in real Gardener landscapes. The rotation assumes the following order: t0: The secrets manager generates a new global observability ingress secret in the runtime cluster and copies it to the `garden` namespace in the virtual garden cluster. t1: The gardener-controller-manager (GCM) sees the new secret in the `garden` namespace and propagates it to each seed namespace. t2: The gardener-operator annotates the seeds for reconciliation. t3: The gardenlet picks up and deploys the new global observability ingress secret in the seed. This path works, but t1 and t2 swap if the gardener-operator triggers seed reconciliation before the GCM copies the new secret to the corresponding seed namespaces. This commit propagates the `last-rotation-initiation-time` label to the secret replicas, and adds a step to the gardener-operator rotation flow between t1 and t2. The step blocks until every seed namespace in the virtual garden holds a replica whose `last-rotation-initiation-time` is greater than or equal to the one on the original secret in the runtime cluster. This enforces the t1-before-t2 ordering: the operator does not annotate the seeds until the GCM has finished propagating the new secret. * Deduplicate secret creation in observability rotation tests The tests that exercise empty and non-numeric `last-rotation-initiation-time` label values inlined the full secret creation. This adds a string-based helper that carries the label value as a string.
…EtcdVersion` feature gate is enabled (gardener#15447) * Use `memberNamePrefix` only when etcd-druid `UpgradeEtcdVersion` feature gate in enabled * Address review --------- Co-authored-by: acumino <[email protected]>
ske-prow
Bot
added
kind/cherry-pick
hammadzf
approved these changes
Aug 6, 2026
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hammadzf The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ske-prow
Bot
added
approved
|
LGTM label has been added. DetailsGit tree hash: f636e5fdf4d91bcd88af97c06d06b2dca6d47af6 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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?
/kind cherry-pick
What this PR does / why we need it:
See ske-v1.148...gardener:gardener:release-v1.148
Special notes for your reviewer:
/cc @stackitcloud/ske-gardener