Merge pull request #15209 from degorenko/fix-mgr-label

mgr: fix label selector when updating mgr active label
This commit is contained in:
Travis Nielsen authored and GitHub committed 2024-12-20 10:27:34 -07:00
commit ea57e18f8b
1 file changed
+1 -1
+1 -1
View File
@@ -252,7 +252,7 @@ func (c *Cluster) removeExtraMgrs(daemonIDs []string) {
// Otherwise sets 'mgr_role: standby' label to manager pods.
func (c *Cluster) SetMgrRoleLabel(daemonNameToUpdate string, isActive bool) error {
pods, err := c.context.Clientset.CoreV1().Pods(c.clusterInfo.Namespace).List(c.clusterInfo.Context, metav1.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", controller.DaemonIDLabel, daemonNameToUpdate),
LabelSelector: fmt.Sprintf("%s=%s,%s=%s", k8sutil.AppAttr, AppName, controller.DaemonIDLabel, daemonNameToUpdate),
})
if err != nil {
logger.Infof("cannot get pod for mgr daemon %s", daemonNameToUpdate)