first part of adding --node-label command flag to pgo create cluster command, this replaces the older --node-name command flag...

Author: jmccormick2001

apiserver/clusterservice/clusterimpl.go

@@ -242,7 +242,7 @@ func getPods(cluster *crv1.Pgcluster) ([]msgs.ShowClusterPod, error) {
 		d := msgs.ShowClusterPod{}
 		d.Name = p.Name
 		d.Phase = string(p.Status.Phase)
-		d.NodeName = p.Spec.NodeName
+		d.NodeLabel = ""
 		d.ReadyStatus = getReadyStatus(&p)
 		//log.Infof("pod details are %v\n", p)
 		d.PVCName = getPVCName(&p)
@@ -541,13 +541,33 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 			}
 		}
 
-		if request.NodeName != "" {
-			valid, reason, allNodes := apiserver.IsValidNodeName(request.NodeName)
-			if !valid {
+		if request.NodeLabel != "" {
+			parts := strings.Split(request.NodeLabel, "=")
+			if len(parts) != 2 {
 				resp.Status.Code = msgs.Error
-				resp.Status.Msg = request.NodeName + " NodeName was not valid, " + reason + " valid nodes are " + allNodes
+				resp.Status.Msg = request.NodeLabel + " node label does not follow key=value format"
 				return resp
 			}
+
+			keyValid, valueValid, err := apiserver.IsValidNodeLabel(parts[0], parts[1])
+			if err != nil {
+				resp.Status.Code = msgs.Error
+				resp.Status.Msg = err.Error()
+				return resp
+			}
+
+			if !keyValid {
+				resp.Status.Code = msgs.Error
+				resp.Status.Msg = request.NodeLabel + " key was not valid .. check node labels for correct values to specify"
+				return resp
+			}
+			if !valueValid {
+				resp.Status.Code = msgs.Error
+				resp.Status.Msg = request.NodeLabel + " node label value was not valid .. check node labels for correct values to specify"
+				return resp
+			}
+			userLabelsMap["NodeLabelKey"] = parts[0]
+			userLabelsMap["NodeLabelValue"] = parts[1]
 		}
 
 		if request.ReplicaStorageConfig != "" {
@@ -588,15 +608,6 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 
 		// Create an instance of our CRD
 
-		if request.NodeName != "" {
-			err = validateNodeName(request.NodeName)
-			if err != nil {
-				resp.Status.Code = msgs.Error
-				resp.Status.Msg = err.Error()
-				return resp
-			}
-		}
-
 		newInstance := getClusterParams(request, clusterName, userLabelsMap)
 		validateConfigPolicies(request.Policies)
 
@@ -708,7 +719,6 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.RootPassword = ""
 	spec.Replicas = "0"
 	spec.Strategy = "1"
-	spec.NodeName = request.NodeName
 	spec.UserLabels = userLabelsMap
 
 	//override any values from config file
@@ -799,32 +809,6 @@ func validateSecretFrom(secretname string) error {
 	return err
 }
 
-func validateNodeName(nodeName string) error {
-	var err error
-	lo := meta_v1.ListOptions{}
-	nodes, err := apiserver.Clientset.CoreV1().Nodes().List(lo)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	found := false
-	allNodes := ""
-
-	for _, node := range nodes.Items {
-		if node.Name == nodeName {
-			found = true
-		}
-		allNodes += node.Name + " "
-	}
-
-	if found == false {
-		return errors.New("node name was not found...valid nodes include " + allNodes)
-	}
-
-	return err
-
-}
-
 func getReadyStatus(pod *v1.Pod) string {
 	readyCount := 0
 	containerCount := 0

apiserver/root.go

@@ -368,36 +368,34 @@ func IsValidStorageName(name string) bool {
 	return ok
 }
 
-// IsValidNodeName returns true or false if
-// a node is valid, returns a string that
-// describes the not valid condition, and
-// lastly a string of all valid nodes found
-func IsValidNodeName(nodeName string) (bool, string, string) {
+// IsValidNodeLabel
+// returns bool for key validity
+// returns bool for value validity
+// returns error
+func IsValidNodeLabel(key, value string) (bool, bool, error) {
 
 	var err error
-	found := false
-	allNodes := ""
+	keyValid := false
+	valueValid := false
 
-	lo := meta_v1.ListOptions{}
-	nodes, err := Clientset.CoreV1().Nodes().List(lo)
+	nodes, err := Clientset.CoreV1().Nodes().List(meta_v1.ListOptions{})
 	if err != nil {
 		log.Error(err)
-		return false, err.Error(), allNodes
+		return false, false, err
 	}
 
+	var v string
 	for _, node := range nodes.Items {
-		log.Infof("%v\n", node)
-		if node.Name == nodeName {
-			found = true
+		v = node.ObjectMeta.Labels[key]
+		if v != "" {
+			keyValid = true
+		}
+		if v == value {
+			valueValid = true
 		}
-		allNodes += node.Name + " "
-	}
-
-	if found == false {
-		return false, "not found", allNodes
 	}
 
-	return true, "", allNodes
+	return keyValid, valueValid, err
 }
 
 func IsValidContainerResourceValues() bool {

apiservermsgs/clustermsgs.go

@@ -23,7 +23,7 @@ import (
 type CreateClusterRequest struct {
 	Name                 string
 	Namespace            string
-	NodeName             string
+	NodeLabel            string
 	Password             string
 	SecretFrom           string
 	BackupPVC            string
@@ -58,7 +58,7 @@ type ShowClusterService struct {
 type ShowClusterPod struct {
 	Name        string
 	Phase       string
-	NodeName    string
+	NodeLabel   string
 	PVCName     string
 	ReadyStatus string
 	Primary     bool

conf/postgres-operator/cluster/1/affinity.json

@@ -4,10 +4,10 @@
 			    "weight": 1,
 			    "preference": {
 				"matchExpressions": [{
-				    "key": "kubernetes.io/hostname",
+				    "key": "{{.NodeLabelKey}}",
 				    "operator": "{{.OperatorValue}}",
 				    "values": [
-					"{{.Node}}"
+					"{{.NodeLabelValue}}"
 				    ]   
 				}]  
 			    }   

operator/cluster/cluster_strategy_1.go

@@ -40,8 +40,9 @@ const AffinityInOperator = "In"
 const AFFINITY_NOTINOperator = "NotIn"
 
 type affinityTemplateFields struct {
-	Node          string
-	OperatorValue string
+	NodeLabelKey   string
+	NodeLabelValue string
+	OperatorValue  string
 }
 
 type containerResourcesTemplateFields struct {
@@ -121,7 +122,7 @@ func (r Strategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.REST
 		RootSecretName:     cl.Spec.RootSecretName,
 		PrimarySecretName:  cl.Spec.PrimarySecretName,
 		UserSecretName:     cl.Spec.UserSecretName,
-		NodeSelector:       GetAffinity(cl.Spec.NodeName, "In"),
+		NodeSelector:       GetAffinity(cl.Spec.UserLabels["NodeLabelKey"], cl.Spec.UserLabels["NodeLabelValue"], "In"),
 		ContainerResources: GetContainerResources(&cl.Spec.ContainerResources),
 		ConfVolume:         GetConfVolume(clientset, cl.Spec.CustomConfig, namespace),
 		CollectAddon:       GetCollectAddon(&cl.Spec),
@@ -364,7 +365,7 @@ func (r Strategy1) CreateReplica(serviceName string, clientset *kubernetes.Clien
 		PrimarySecretName:  cl.Spec.PrimarySecretName,
 		ContainerResources: GetContainerResources(&cl.Spec.ContainerResources),
 		UserSecretName:     cl.Spec.UserSecretName,
-		NodeSelector:       GetAffinity(cl.Spec.NodeName, "NotIn"),
+		NodeSelector:       GetAffinity(cl.Spec.UserLabels["NodeLabelKey"], cl.Spec.UserLabels["NodeLabelValue"], "NotIn"),
 	}
 
 	switch cl.Spec.ReplicaStorage.StorageType {
@@ -417,15 +418,16 @@ func getPrimaryLabels(Name string, ClusterName string, replicaFlag bool, userLab
 }
 
 // GetAffinity ...
-func GetAffinity(nodeName string, operator string) string {
-	log.Debugf("GetAffinity with nodeName=[%s] and operator=[%s]\n", nodeName, operator)
+func GetAffinity(nodeLabelKey, nodeLabelValue string, operator string) string {
+	log.Debugf("GetAffinity with nodeLabelKey=[%s] nodeLabelKey=[%s] and operator=[%s]\n", nodeLabelKey, nodeLabelValue, operator)
 	output := ""
-	if nodeName == "" {
+	if nodeLabelKey == "" {
 		return output
 	}
 
 	affinityTemplateFields := affinityTemplateFields{}
-	affinityTemplateFields.Node = nodeName
+	affinityTemplateFields.NodeLabelKey = nodeLabelKey
+	affinityTemplateFields.NodeLabelValue = nodeLabelValue
 	affinityTemplateFields.OperatorValue = operator
 
 	var affinityDoc bytes.Buffer
@@ -554,7 +556,7 @@ func (r Strategy1) Scale(clientset *kubernetes.Clientset, client *rest.RESTClien
 		RootSecretName:    cluster.Spec.RootSecretName,
 		PrimarySecretName: cluster.Spec.PrimarySecretName,
 		UserSecretName:    cluster.Spec.UserSecretName,
-		NodeSelector:      GetAffinity(cluster.Spec.NodeName, "NotIn"),
+		NodeSelector:      GetAffinity(cluster.Spec.UserLabels["NodeLabelKey"], cluster.Spec.UserLabels["NodeLabelValue"], "NotIn"),
 	}
 
 	switch replica.Spec.ReplicaStorage.StorageType {

operator/cluster/upgrade_strategy_1.go

@@ -91,7 +91,7 @@ func (r Strategy1) MinorUpgrade(clientset *kubernetes.Clientset, restclient *res
 		RootSecretName:    cl.Spec.RootSecretName,
 		PrimarySecretName: cl.Spec.PrimarySecretName,
 		UserSecretName:    cl.Spec.UserSecretName,
-		NodeSelector:      GetAffinity(cl.Spec.NodeName, "In"),
+		NodeSelector:      GetAffinity(cl.Spec.UserLabels["NodeLabelKey"], cl.Spec.UserLabels["NodeLabelValue"], "In"),
 		ConfVolume:        GetConfVolume(clientset, cl.Spec.CustomConfig, namespace),
 		CollectAddon:      GetCollectAddon(&cl.Spec),
 	}

pgo/cmd/cluster.go

@@ -155,7 +155,7 @@ func printCluster(detail *msgs.ShowClusterDetail) {
 	fmt.Println("cluster : " + detail.Cluster.Spec.Name + " (" + detail.Cluster.Spec.CCPImageTag + ")")
 
 	for _, pod := range detail.Pods {
-		fmt.Println(TreeBranch + "pod : " + pod.Name + " (" + string(pod.Phase) + " on " + pod.NodeName + ") (" + pod.ReadyStatus + ")")
+		fmt.Println(TreeBranch + "pod : " + pod.Name + " (" + string(pod.Phase) + " on " + pod.NodeLabel + ") (" + pod.ReadyStatus + ")")
 		fmt.Println(TreeBranch + "pvc : " + pod.PVCName)
 	}
 
@@ -212,7 +212,7 @@ func createCluster(args []string) {
 
 	r := new(msgs.CreateClusterRequest)
 	r.Name = args[0]
-	r.NodeName = NodeName
+	r.NodeLabel = NodeLabel
 	r.Password = Password
 	r.SecretFrom = SecretFrom
 	r.BackupPVC = BackupPVC

pgo/cmd/create.go

@@ -31,7 +31,7 @@ var CCPImageTag string
 var Password string
 var SecretFrom, BackupPath, BackupPVC string
 var PoliciesFlag, PolicyFile, PolicyURL string
-var NodeName string
+var NodeLabel string
 var UserLabels string
 var IngestConfig string
 
@@ -171,7 +171,7 @@ func init() {
 	createClusterCmd.Flags().StringVarP(&CustomConfig, "custom-config", "g", "", "The name of a configMap that holds custom PG config files used to override the defaults")
 	createClusterCmd.Flags().StringVarP(&StorageConfig, "storage-config", "", "", "The name of a Storage config in pgo.yaml to use for the cluster storage.")
 	createClusterCmd.Flags().StringVarP(&ReplicaStorageConfig, "replica-storage-config", "", "", "The name of a Storage config in pgo.yaml to use for the cluster replica storage.")
-	createClusterCmd.Flags().StringVarP(&NodeName, "node-name", "", "", "The node on which to place the primary database, if not set any node is used")
+	createClusterCmd.Flags().StringVarP(&NodeLabel, "node-label", "", "", "The node label (key=value) to use in placing the primary database, if not set any node is used")
 	createClusterCmd.Flags().StringVarP(&Password, "password", "w", "", "The password to use for initial database users")
 	createClusterCmd.Flags().StringVarP(&SecretFrom, "secret-from", "s", "", "The cluster name to use when restoring secrets")
 	createClusterCmd.Flags().StringVarP(&BackupPVC, "backup-pvc", "p", "", "The backup archive PVC to restore from")