Skip to content
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

fix issue-314 by checking zookeeperCluster resource version before updating sts ADDENDUM #355

Merged
merged 1 commit into from
Jul 1, 2021
Merged

fix issue-314 by checking zookeeperCluster resource version before updating sts ADDENDUM #355

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
4 changes: 2 additions & 2 deletions pkg/controller/zookeepercluster/zookeepercluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ func (r *ReconcileZookeeperCluster) reconcileStatefulSet(instance *zookeeperv1be
return err
} else {
// check whether zookeeperCluster is updated before updating the sts
if !zookeeperClusterFresherThanSts(instance, sts) {
return fmt.Errorf("Staleness: cr.ResourceVersion %s is smaller than labeledRV %s", instance.ResourceVersion, sts.Labels["owner-rv"])
if !zookeeperClusterFresherThanSts(instance, foundSts) {
return fmt.Errorf("Staleness: cr.ResourceVersion %s is smaller than labeledRV %s", instance.ResourceVersion, foundSts.Labels["owner-rv"])
}
foundSTSSize := *foundSts.Spec.Replicas
newSTSSize := *sts.Spec.Replicas
Expand Down