Small refactoring

Author: hughcapet

pkg/cluster/majorversionupgrade.go

@@ -5,12 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/Masterminds/semver"
 	"github.com/zalando/postgres-operator/pkg/spec"
 	"github.com/zalando/postgres-operator/pkg/util"
-	"github.com/zalando/postgres-operator/pkg/util/retryutil"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -108,71 +106,31 @@ func (c *Cluster) removeFailuresAnnotation() error {
 	return nil
 }
 
-func (c *Cluster) labelCriticalOperation(pods []v1.Pod) error {
-	for _, pod := range pods {
-		var meta metav1.ObjectMeta
-		meta.Labels = map[string]string{"critical-operaton": "true"}
-		patchData, err := json.Marshal(struct {
-			ObjMeta interface{} `json:"metadata"`
-		}{&meta})
-		if err != nil {
-			return fmt.Errorf("could not form patch for critical operation label: %v", err)
-		}
+func (c *Cluster) criticalOperationLabel(pods []v1.Pod, remove bool) error {
+	var action string
+	var metadataReq map[string]map[string]map[string]*string
 
-		err = retryutil.Retry(1*time.Second, 5*time.Second,
-			func() (bool, error) {
-				_, err2 := c.KubeClient.Pods(pod.Namespace).Patch(
-					context.TODO(),
-					pod.Name,
-					types.MergePatchType,
-					[]byte(patchData),
-					metav1.PatchOptions{},
-					"")
-				if err2 != nil {
-					return false, err2
-				}
-				return true, nil
-			})
-		if err != nil {
-			return fmt.Errorf("could not patch pod critical operation label: %v", err)
-		}
+	if remove {
+		action = "remove"
+		metadataReq = map[string]map[string]map[string]*string{"metadata": {"labels": {"critical-operaton": nil}}}
+
+	} else {
+		action = "assign"
+		val := "true"
+		metadataReq = map[string]map[string]map[string]*string{"metadata": {"labels": {"critical-operaton": &val}}}
 	}
-	c.logger.Info("pods are patched with critical operation label")
-	return nil
-}
 
-func (c *Cluster) removeCriticalOperationLabel(pods []v1.Pod) error {
+	patchReq, err := json.Marshal(metadataReq)
+	if err != nil {
+		return fmt.Errorf("could not marshal ObjectMeta to %s critical operation label: %v", action, err)
+	}
 	for _, pod := range pods {
-		annotationToRemove := []map[string]string{
-			{
-				"op":   "remove",
-				"path": fmt.Sprintf("/metadata/labels/%s", "critical-operaton"),
-			},
-		}
-		removePatch, err := json.Marshal(annotationToRemove)
+		_, err = c.KubeClient.Pods(c.Namespace).Patch(context.TODO(), pod.Name, types.StrategicMergePatchType, patchReq, metav1.PatchOptions{})
 		if err != nil {
-			c.logger.Errorf("could not form patch for critical operation label: %v", err)
+			c.logger.Errorf("failed to %s critical operation label for pod %s: %v", action, pod.Name, err)
 			return err
 		}
-		err = retryutil.Retry(1*time.Second, 5*time.Second,
-			func() (bool, error) {
-				_, err2 := c.KubeClient.Pods(pod.Namespace).Patch(
-					context.TODO(),
-					pod.Name,
-					types.JSONPatchType,
-					[]byte(removePatch),
-					metav1.PatchOptions{},
-					"")
-				if err2 != nil {
-					return false, err2
-				}
-				return true, nil
-			})
-		if err != nil {
-			return fmt.Errorf("failed to remove pod critical operation label: %v", err)
-		}
 	}
-	c.logger.Info("critical operation label is removed from all pods")
 	return nil
 }
 
@@ -290,12 +248,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.removeCriticalOperationLabel(pods); err != nil {
+				if err = c.criticalOperationLabel(pods, true); err != nil {
 					return fmt.Errorf("failed to remove critical-operation label: %s", err)
 				}
 				return nil
 			}()
-			if err = c.labelCriticalOperation(pods); err != nil {
+			if err = c.criticalOperationLabel(pods, false); err != nil {
 				return fmt.Errorf("failed to assign critical-operation label: %s", err)
 			}