fix: resolve conflicts

Longhorn 6961 Signed-off-by: Jack Lin <jack.lin@suse.com>
longhorn · Nov 13, 2023 · 8f86ed2 · 8f86ed2
1 parent 4c54bb4
commit 8f86ed2
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/controller/volume_controller.go b/controller/volume_controller.go
@@ -2846,17 +2846,9 @@ func (c *VolumeController) upgradeEngineForVolume(v *longhorn.Volume, es map[str
 		return nil
 	}
 
-<<<<<<< HEAD
-	if err := c.switchActiveReplicas(rs, func(r *longhorn.Replica, engineImage string) bool {
+	c.switchActiveReplicas(rs, func(r *longhorn.Replica, engineImage string) bool {
 		return r.Spec.EngineImage == engineImage && r.DeletionTimestamp.IsZero()
-	}, v.Spec.EngineImage); err != nil {
-		return err
-	}
-=======
-	c.switchActiveReplicas(rs, func(r *longhorn.Replica, image string) bool {
-		return r.Spec.Image == image && r.DeletionTimestamp.IsZero()
-	}, v.Spec.Image)
->>>>>>> 3d0f79bb (Clean up pointless error return)
+	}, v.Spec.EngineImage)
 
 	e.Spec.ReplicaAddressMap = e.Spec.UpgradedReplicaAddressMap
 	e.Spec.UpgradedReplicaAddressMap = map[string]string{}