Skip to content

fix cleanup logic when shoot is going to hibernation or waking up #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gardener-prow merged 1 commit into from
Feb 25, 2026
Merged

fix cleanup logic when shoot is going to hibernation or waking up #1714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions pkg/controller/controlplane/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ func (a *actuator) Reconcile(

// Clean up NetworkUnavailable conditions set by Calico only when overlay is disabled
// Only run cleanup if it hasn't been completed yet (annotation not present)
if !overlayEnabled && cp.Annotations[AnnotationCalicoCleanupCompleted] != "true" {
if err := a.cleanupCalicoNetworkUnavailableConditions(ctx, log, cp.Namespace, cluster); err != nil {
// Skip if cluster is hibernated or transitioning (hibernating/waking up)
if !overlayEnabled && !extensionscontroller.IsHibernated(cluster) && !extensionscontroller.IsHibernatingOrWakingUp(cluster) && cp.Annotations[AnnotationCalicoCleanupCompleted] != "true" {
if err := a.cleanupCalicoNetworkUnavailableConditions(ctx, log, cp.Namespace); err != nil {
log.Error(err, "Failed to cleanup Calico NetworkUnavailable conditions")
return ok, err
} else {
Expand Down Expand Up @@ -98,12 +99,7 @@ func (a *actuator) cleanupCalicoNetworkUnavailableConditions(
ctx context.Context,
log logr.Logger,
namespace string,
cluster *extensionscontroller.Cluster,
) error {
if extensionscontroller.IsHibernated(cluster) {
return nil
}

_, shootClient, err := util.NewClientForShoot(ctx, a.client, namespace, client.Options{}, extensionsconfigv1alpha1.RESTOptions{})
if err != nil {
return fmt.Errorf("could not create shoot client: %w", err)
Expand Down
Loading