Skip to content

Commit d47ab9d

Browse files
committed
fix cleanup logic when shoot is going to hibernation or waking up
1 parent c73cf0b commit d47ab9d

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

pkg/controller/controlplane/actuator.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ func (a *actuator) Reconcile(
6868

6969
// Clean up NetworkUnavailable conditions set by Calico only when overlay is disabled
7070
// Only run cleanup if it hasn't been completed yet (annotation not present)
71-
if !overlayEnabled && cp.Annotations[AnnotationCalicoCleanupCompleted] != "true" {
72-
if err := a.cleanupCalicoNetworkUnavailableConditions(ctx, log, cp.Namespace, cluster); err != nil {
71+
if !overlayEnabled && !extensionscontroller.IsHibernated(cluster) && !extensionscontroller.IsHibernatingOrWakingUp(cluster) && cp.Annotations[AnnotationCalicoCleanupCompleted] != "true" {
72+
if err := a.cleanupCalicoNetworkUnavailableConditions(ctx, log, cp.Namespace); err != nil {
7373
log.Error(err, "Failed to cleanup Calico NetworkUnavailable conditions")
7474
return ok, err
7575
} else {
@@ -98,11 +98,7 @@ func (a *actuator) cleanupCalicoNetworkUnavailableConditions(
9898
ctx context.Context,
9999
log logr.Logger,
100100
namespace string,
101-
cluster *extensionscontroller.Cluster,
102101
) error {
103-
if extensionscontroller.IsHibernated(cluster) {
104-
return nil
105-
}
106102

107103
_, shootClient, err := util.NewClientForShoot(ctx, a.client, namespace, client.Options{}, extensionsconfigv1alpha1.RESTOptions{})
108104
if err != nil {

0 commit comments

Comments
 (0)