Merge pull request rook#12137 from travisn/active-mgr-default

mgr: Default to active mgr label
denppa · Apr 25, 2023 · 844712a · 844712a
2 parents 46e6b73 + 1fa3c5a
commit 844712a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/operator/ceph/cluster/mgr/mgr.go b/pkg/operator/ceph/cluster/mgr/mgr.go
@@ -52,6 +52,8 @@ const (
 	balancerModuleName     = "balancer"
 	balancerModuleMode     = "upmap"
 	mgrRoleLabelName       = "mgr_role"
+	activeMgrStatus        = "active"
+	standbyMgrStatus       = "standby"
 	monitoringPath         = "/etc/ceph-monitoring/"
 	serviceMonitorFile     = "service-monitor.yaml"
 	// minimum amount of memory in MB to run the pod
@@ -238,9 +240,9 @@ func (c *Cluster) UpdateActiveMgrLabel(daemonNameToUpdate string, prevActiveMgr
 
 		labels := pod.GetLabels()
 		cephDaemonId := labels[controller.DaemonIDLabel]
-		newMgrRole := "standby"
+		newMgrRole := standbyMgrStatus
 		if currActiveMgr == cephDaemonId {
-			newMgrRole = "active"
+			newMgrRole = activeMgrStatus
 		}
 
 		currMgrRole, mgrHasLabel := labels[mgrRoleLabelName]
@@ -323,7 +325,7 @@ func (c *Cluster) updateServiceSelectors() {
 		_, hasMgrRoleLabel := service.Spec.Selector[mgrRoleLabelName]
 		if !hasMgrRoleLabel {
 			logger.Infof("adding %s selector label on mgr service %q", mgrRoleLabelName, service.Name)
-			service.Spec.Selector[mgrRoleLabelName] = "active"
+			service.Spec.Selector[mgrRoleLabelName] = activeMgrStatus
 			updateService = true
 		}
 

diff --git a/pkg/operator/ceph/cluster/mgr/spec.go b/pkg/operator/ceph/cluster/mgr/spec.go
@@ -331,6 +331,10 @@ func (c *Cluster) getPodLabels(mgrConfig *mgrConfig, includeNewLabels bool) map[
 	labels := controller.CephDaemonAppLabels(AppName, c.clusterInfo.Namespace, config.MgrType, mgrConfig.DaemonID, c.clusterInfo.NamespacedName().Name, "cephclusters.ceph.rook.io", includeNewLabels)
 	// leave "instance" key for legacy usage
 	labels["instance"] = mgrConfig.DaemonID
+	if includeNewLabels {
+		// default to the active mgr label, and allow the sidecar to update if it's in standby mode
+		labels[mgrRoleLabelName] = activeMgrStatus
+	}
 	return labels
 }