Test

spotahome · May 14, 2024 · d95f426 · d95f426
1 parent d010b1e
commit d95f426
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/operator/redisfailover/service/check.go b/operator/redisfailover/service/check.go
@@ -141,19 +141,11 @@ func (r *RedisFailoverChecker) CheckAllSlavesFromMaster(master string, rf *redis
 			if err != nil {
 				return err
 			}
-			err = r.setMasterAnnotationIfNecessary(rf.Namespace, rp)
-			if err != nil {
-				return err
-			}
 		} else {
 			err = r.setSlaveLabelIfNecessary(rf.Namespace, rp)
 			if err != nil {
 				return err
 			}
-			err = r.setSlaveAnnotationIfNecessary(rf.Namespace, rp)
-			if err != nil {
-				return err
-			}
 		}
 
 		slave, err := r.redisClient.GetSlaveOf(rp.Status.PodIP, rport, password)

diff --git a/operator/redisfailover/service/heal.go b/operator/redisfailover/service/heal.go
@@ -103,10 +103,6 @@ func (r *RedisFailoverHealer) MakeMaster(ip string, rf *redisfailoverv1.RedisFai
 			if err != nil {
 				return err
 			}
-			err = r.setMasterAnnotationIfNecessary(rf.Namespace, rp)
-			if err != nil {
-				return err
-			}
 		}
 	}
 	return nil
@@ -148,10 +144,6 @@ func (r *RedisFailoverHealer) SetOldestAsMaster(rf *redisfailoverv1.RedisFailove
 			if err != nil {
 				return err
 			}
-			err = r.setMasterAnnotationIfNecessary(rf.Namespace, pod)
-			if err != nil {
-				return err
-			}
 
 			newMasterIP = pod.Status.PodIP
 		} else {
@@ -164,11 +156,6 @@ func (r *RedisFailoverHealer) SetOldestAsMaster(rf *redisfailoverv1.RedisFailove
 			if err != nil {
 				return err
 			}
-
-			err = r.setSlaveAnnotationIfNecessary(rf.Namespace, pod)
-			if err != nil {
-				return err
-			}
 		}
 	}
 	if newMasterIP == "" {
@@ -211,10 +198,6 @@ func (r *RedisFailoverHealer) SetMasterOnAll(masterIP string, rf *redisfailoverv
 			if err != nil {
 				return err
 			}
-			err = r.setSlaveAnnotationIfNecessary(rf.Namespace, pod)
-			if err != nil {
-				return err
-			}
 		}
 	}
 	return nil