From 2c0673ef173b366d22e45addde39a87f710de0f5 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 25 Feb 2021 17:01:51 +0100 Subject: [PATCH] remove annotation check as we do not pass patched pods to recreatePods --- pkg/cluster/pod.go | 5 ----- pkg/cluster/sync.go | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go index ad40f67f0..c8dfe2a13 100644 --- a/pkg/cluster/pod.go +++ b/pkg/cluster/pod.go @@ -429,11 +429,6 @@ func (c *Cluster) recreatePods(pods []v1.Pod, switchoverCandidates []spec.Namesp continue } - // double check one more time if the rolling update flag is still there - if !c.getRollingUpdateFlagFromPod(&pod) { - continue - } - podName := util.NameFromMeta(pod.ObjectMeta) newPod, err := c.recreatePod(podName) if err != nil { diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 9f73bc133..62d9c1864 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -351,6 +351,7 @@ func (c *Cluster) syncStatefulSet() error { if !cmp.match { if cmp.rollingUpdate { podsToRecreate = make([]v1.Pod, 0) + switchoverCandidates = make([]spec.NamespacedName, 0) for _, pod := range pods { if err = c.markRollingUpdateFlagForPod(&pod, "pod changes"); err != nil { return fmt.Errorf("updating rolling update flag for pod failed: %v", err)