Small refactoring

Author: hughcapet

pkg/cluster/majorversionupgrade.go

@@ -106,14 +106,13 @@ func (c *Cluster) removeFailuresAnnotation() error {
 	return nil
 }
 
-func (c *Cluster) criticalOperationLabel(pods []v1.Pod, active bool) error {
+func (c *Cluster) criticalOperationLabel(pods []v1.Pod, value string) error {
 	var action string
 	var metadataReq map[string]map[string]map[string]*string
 
-	if active {
+	if value != "" {
 		action = "assign"
-		val := "true"
-		metadataReq = map[string]map[string]map[string]*string{"metadata": {"labels": {"critical-operation": &val}}}
+		metadataReq = map[string]map[string]map[string]*string{"metadata": {"labels": {"critical-operation": &value}}}
 	} else {
 		action = "remove"
 		metadataReq = map[string]map[string]map[string]*string{"metadata": {"labels": {"critical-operation": nil}}}
@@ -252,12 +251,12 @@ func (c *Cluster) majorVersionUpgrade() error {
 		c.logger.Infof("healthy cluster ready to upgrade, current: %d desired: %d", c.currentMajorVersion, desiredVersion)
 		if c.currentMajorVersion < desiredVersion {
 			defer func() error {
-				if err = c.criticalOperationLabel(pods, false); err != nil {
+				if err = c.criticalOperationLabel(pods, ""); err != nil {
 					return fmt.Errorf("failed to remove critical-operation label: %s", err)
 				}
 				return nil
 			}()
-			if err = c.criticalOperationLabel(pods, true); err != nil {
+			if err = c.criticalOperationLabel(pods, "true"); err != nil {
 				return fmt.Errorf("failed to assign critical-operation label: %s", err)
 			}