update affinity logic

Author: Jeff McCormick

client/cmd/cluster.go

@@ -259,6 +259,7 @@ func getClusterParams(name string) *tpr.PgCluster {
 	spec.FS_GROUP = ""
 	spec.SUPPLEMENTAL_GROUPS = ""
 	spec.STRATEGY = "1"
+	spec.NodeName = NodeName
 
 	//override any values from config file
 	str := viper.GetString("CLUSTER.PORT")
@@ -362,6 +363,49 @@ func getReadyStatus(pod *v1.Pod) string {
 
 }
 
+func getValidNodeName() string {
+	var err error
+	nodes, err := Clientset.CoreV1().Nodes().List(meta_v1.ListOptions{})
+	if err != nil {
+		panic(err.Error())
+	}
+
+	//TODO randomize the node selection
+	for _, node := range nodes.Items {
+		return node.Name
+	}
+
+	panic("no nodes found")
+
+	return "error here"
+
+}
+func validateNodeName(nodeName string) error {
+	var err error
+	lo := meta_v1.ListOptions{}
+	nodes, err := 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 validateSecretFrom(secretname string) error {
 	var err error
 	lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + secretname}

client/cmd/create.go

@@ -25,6 +25,7 @@ var CCP_IMAGE_TAG string
 var Password string
 var SecretFrom, BackupPath, BackupPVC string
 var PoliciesFlag, PolicyFile, PolicyURL string
+var NodeName string
 
 // createCmd represents the create command
 var createCmd = &cobra.Command{
@@ -66,6 +67,18 @@ pgo create cluster mycluster`,
 			}
 		}
 
+		//always have a valid NodeName
+		if NodeName == "" {
+			NodeName = getValidNodeName()
+		} else {
+			err = validateNodeName(NodeName)
+			if err != nil {
+				log.Error(err)
+				return
+			}
+
+		}
+
 		if len(args) == 0 {
 			log.Error("a cluster name is required for this command")
 		} else {
@@ -106,6 +119,7 @@ func init() {
 
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
+	createClusterCmd.Flags().StringVarP(&NodeName, "node-name", "n", "", "The node on which to place the master database")
 	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")

operator/cluster/clone.go

@@ -293,6 +293,7 @@ func copyTPR(cluster *tpr.PgCluster, clone *tpr.PgClone) *tpr.PgCluster {
 	spec.SUPPLEMENTAL_GROUPS = cluster.Spec.SUPPLEMENTAL_GROUPS
 	spec.STRATEGY = cluster.Spec.STRATEGY
 	spec.BACKUP_PATH = cluster.Spec.BACKUP_PATH
+	spec.NodeName = cluster.Spec.NodeName
 
 	newInstance := &tpr.PgCluster{
 		Metadata: meta_v1.ObjectMeta{

operator/cluster/cluster.go

@@ -344,19 +344,6 @@ func ScaleReplicas(serviceName string, clientset *kubernetes.Clientset, cl *tpr.
 			log.Error(err)
 			return
 		}
-		//create a Deployment
-		//serviceName := depName + "-replica"
-		//replicaServiceFields := ServiceTemplateFields{
-		//Name:        serviceName,
-		//ClusterName: cl.Spec.Name,
-		//Port:        cl.Spec.Port,
-		//}
-
-		//err = CreateService(clientset, &replicaServiceFields, namespace)
-		//if err != nil {
-		//log.Error(err)
-		//return
-		//}
 		strategy.CreateReplica(serviceName, clientset, cl, depName, pvcName, namespace, false)
 	}
 }

operator/cluster/cluster_strategy_1.go

@@ -93,7 +93,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,
 		PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
 		PGUSER_SECRET_NAME:   cl.Spec.PGUSER_SECRET_NAME,
-		NODE_SELECTOR:        "operator",
+		NODE_SELECTOR:        cl.Spec.NodeName,
 	}
 
 	err = DeploymentTemplate1.Execute(&masterDoc, deploymentFields)
@@ -140,6 +140,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 				log.Error("error in creating replica service " + err.Error())
 				return err
 			}
+
 			ScaleReplicas(serviceName, clientset, cl, newReplicas, namespace)
 		}
 	}
@@ -427,7 +428,7 @@ func (r ClusterStrategy1) CreateReplica(serviceName string, clientset *kubernete
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,
 		PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
 		PGUSER_SECRET_NAME:   cl.Spec.PGUSER_SECRET_NAME,
-		NODE_SELECTOR:        "operator",
+		NODE_SELECTOR:        cl.Spec.NodeName,
 	}
 
 	switch cl.Spec.ReplicaStorage.StorageType {

tpr/cluster.go

@@ -33,6 +33,7 @@ type PgClusterSpec struct {
 	CCP_IMAGE_TAG         string        `json:"ccpimagetag"`
 	POSTGRES_FULL_VERSION string        `json:"postgresfullversion"`
 	Port                  string        `json:"port"`
+	NodeName              string        `json:"nodename"`
 	MasterStorage         PgStorageSpec `json:masterstorage`
 	ReplicaStorage        PgStorageSpec `json:replicastorage`
 	PG_MASTER_HOST        string        `json:"pgmasterhost"`