fix deployment labeling using pgo label command

Author: Jeff McCormick

client/cmd/label.go

@@ -20,6 +20,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/rest"
+	"os"
 	//"github.com/crunchydata/postgres-operator/operator/util"
 	"encoding/json"
 	"github.com/crunchydata/postgres-operator/tpr"
@@ -38,6 +39,7 @@ import (
 )
 
 var LabelCmdLabel string
+var LabelMap map[string]string
 var DeleteLabel bool
 
 var labelCmd = &cobra.Command{
@@ -60,6 +62,7 @@ pgo label --label=environment=prod --selector=status=final --dry-run
 		if LabelCmdLabel == "" {
 			log.Error(`You must specify the label to apply.`)
 		} else {
+			validateLabel()
 			labelClusters(args)
 		}
 	},
@@ -156,13 +159,12 @@ func addLabels(items []tpr.PgCluster) {
 			return
 		}
 
-		newLabels := make(map[string]string)
 		for _, d := range deployments.Items {
 			//update Deployment with the label
 			//fmt.Println(TREE_BRANCH + "deployment : " + d.ObjectMeta.Name)
 			if DryRun {
 			} else {
-				err := updateLabels(&d, Clientset, items[i].Spec.Name, Namespace, newLabels)
+				err := updateLabels(&d, Clientset, items[i].Spec.Name, Namespace, LabelMap)
 				if err != nil {
 					log.Error(err.Error())
 				}
@@ -176,6 +178,8 @@ func updateLabels(deployment *v1beta1.Deployment, clientset *kubernetes.Clientse
 
 	var err error
 
+	log.Debugf("%v is the labels to apply\n", newLabels)
+
 	var patchBytes, newData, origData []byte
 	origData, err = json.Marshal(deployment)
 	if err != nil {
@@ -254,3 +258,17 @@ func PatchPgCluster(tprclient *rest.RESTClient, newLabel string, oldTpr tpr.PgCl
 	return err6
 
 }
+
+func validateLabel() {
+	//TODO use  the k8s label parser for this validation
+	LabelMap = make(map[string]string)
+	userValues := strings.Split(LabelCmdLabel, ",")
+	for _, v := range userValues {
+		pair := strings.Split(v, "=")
+		if len(pair) != 2 {
+			log.Error("label format incorrect, requires name=value")
+			os.Exit(2)
+		}
+		LabelMap[pair[0]] = pair[1]
+	}
+}

operator/cluster/cluster_strategy_1.go

@@ -125,6 +125,12 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		log.Info("master Deployment " + cl.Spec.Name + " in namespace " + namespace + " already existed so not creating it ")
 	}
 
+	err = util.PatchClusterTPR(client, masterLabels, cl, namespace)
+	if err != nil {
+		log.Error("could not patch master tpr with labels")
+		return err
+	}
+
 	newReplicas, err := strconv.Atoi(cl.Spec.REPLICAS)
 	if err != nil {
 		log.Error("could not convert REPLICAS config setting")

operator/cluster/upgrade_strategy_1.go

@@ -68,13 +68,15 @@ func (r ClusterStrategy1) MinorUpgrade(clientset *kubernetes.Clientset, tprclien
 
 	//create the master deployment
 
+	masterLabels := getMasterLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false, cl.Spec.UserLabels)
+
 	deploymentFields := DeploymentTemplateFields{
 		Name:                 cl.Spec.Name,
 		ClusterName:          cl.Spec.Name,
 		Port:                 cl.Spec.Port,
 		CCP_IMAGE_TAG:        upgrade.Spec.CCP_IMAGE_TAG,
 		PVC_NAME:             util.CreatePVCSnippet(cl.Spec.MasterStorage.StorageType, cl.Spec.MasterStorage.PvcName),
-		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false),
+		OPERATOR_LABELS:      util.GetLabelsFromMap(masterLabels),
 		BACKUP_PVC_NAME:      util.CreateBackupPVCSnippet(cl.Spec.BACKUP_PVC_NAME),
 		BACKUP_PATH:          cl.Spec.BACKUP_PATH,
 		PGDATA_PATH_OVERRIDE: cl.Spec.Name,
@@ -187,14 +189,16 @@ func (r ClusterStrategy1) MajorUpgradeFinalize(clientset *kubernetes.Clientset,
 
 	log.Info("major cluster upgrade finalize using Strategy 1 in namespace " + namespace)
 
+	masterLabels := getMasterLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false, cl.Spec.UserLabels)
+
 	//start the master deployment
 	deploymentFields := DeploymentTemplateFields{
 		Name:                 cl.Spec.Name,
 		ClusterName:          cl.Spec.Name,
 		Port:                 cl.Spec.Port,
 		CCP_IMAGE_TAG:        upgrade.Spec.CCP_IMAGE_TAG,
 		PVC_NAME:             util.CreatePVCSnippet(cl.Spec.MasterStorage.StorageType, upgrade.Spec.NEW_PVC_NAME),
-		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false),
+		OPERATOR_LABELS:      util.GetLabelsFromMap(masterLabels),
 		BACKUP_PVC_NAME:      util.CreateBackupPVCSnippet(upgrade.Spec.BACKUP_PVC_NAME),
 		PGDATA_PATH_OVERRIDE: upgrade.Spec.NEW_DATABASE_NAME,
 		PG_DATABASE:          cl.Spec.PG_DATABASE,

operator/util/util.go

@@ -24,9 +24,11 @@ import (
 	"strconv"
 	"text/template"
 
+	"github.com/crunchydata/postgres-operator/tpr"
+	jsonpatch "github.com/evanphx/json-patch"
+
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
-	//extensionsv1beta1 "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
 	"k8s.io/client-go/rest"
 )
 
@@ -220,3 +222,39 @@ func GetLabelsFromMap(labels map[string]string) string {
 	}
 	return output
 }
+
+func PatchClusterTPR(tprclient *rest.RESTClient, labelMap map[string]string, oldTpr *tpr.PgCluster, namespace string) error {
+
+	oldData, err := json.Marshal(oldTpr)
+	if err != nil {
+		return err
+	}
+	if oldTpr.Metadata.Labels == nil {
+		oldTpr.Metadata.Labels = make(map[string]string)
+	}
+	for k, v := range labelMap {
+		oldTpr.Metadata.Labels[k] = v
+	}
+	var newData, patchBytes []byte
+	newData, err = json.Marshal(oldTpr)
+	if err != nil {
+		return err
+	}
+	patchBytes, err = jsonpatch.CreateMergePatch(oldData, newData)
+	if err != nil {
+		return err
+	}
+
+	log.Debug(string(patchBytes))
+
+	_, err6 := tprclient.Patch(types.MergePatchType).
+		Namespace(namespace).
+		Resource(tpr.CLUSTER_RESOURCE).
+		Name(oldTpr.Spec.Name).
+		Body(patchBytes).
+		Do().
+		Get()
+
+	return err6
+
+}