add --replica-count flag and logic for pgo create cluster, update docs

Author: jmccormick2001

apiserver/clusterservice/clusterimpl.go

@@ -448,6 +448,12 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 		return resp
 	}
 
+	if request.ReplicaCount < 0 {
+		resp.Status.Code = msgs.Error
+		resp.Status.Msg = "invalid replica-count , should be greater than or equal to 0"
+		return resp
+	}
+
 	errs := validation.IsDNS1035Label(clusterName)
 	if len(errs) > 0 {
 		resp.Status.Code = msgs.Error
@@ -740,7 +746,7 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	if request.ContainerResources != "" {
 		spec.ContainerResources, _ = apiserver.Pgo.GetContainerResource(request.ContainerResources)
 	} else {
-		log.Println(apiserver.Pgo.DefaultContainerResources + " is Pgo.DefaultContainerResources")
+		log.Debugf("Pgo.DefaultContainerResources is %s", apiserver.Pgo.DefaultContainerResources)
 		defaultContainerResource := apiserver.Pgo.DefaultContainerResources
 		if defaultContainerResource != "" {
 			spec.ContainerResources, _ = apiserver.Pgo.GetContainerResource(defaultContainerResource)
@@ -750,19 +756,19 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	if request.StorageConfig != "" {
 		spec.PrimaryStorage, _ = apiserver.Pgo.GetStorageSpec(request.StorageConfig)
 	} else {
-		log.Printf("%v", apiserver.Pgo.PrimaryStorage)
+		log.Debugf("%v", apiserver.Pgo.PrimaryStorage)
 		spec.PrimaryStorage, _ = apiserver.Pgo.GetStorageSpec(apiserver.Pgo.PrimaryStorage)
 	}
 
 	if request.ReplicaStorageConfig != "" {
 		spec.ReplicaStorage, _ = apiserver.Pgo.GetStorageSpec(request.ReplicaStorageConfig)
 	} else {
 		spec.ReplicaStorage, _ = apiserver.Pgo.GetStorageSpec(apiserver.Pgo.ReplicaStorage)
-		log.Printf("%v", apiserver.Pgo.ReplicaStorage)
+		log.Debugf("%v", apiserver.Pgo.ReplicaStorage)
 	}
 
 	spec.CCPImageTag = apiserver.Pgo.Cluster.CCPImageTag
-	log.Println(apiserver.Pgo.Cluster.CCPImageTag + " is Pgo.Cluster.CCPImageTag")
+	log.Debugf("Pgo.Cluster.CCPImageTag %s", apiserver.Pgo.Cluster.CCPImageTag)
 	if request.CCPImageTag != "" {
 		spec.CCPImageTag = request.CCPImageTag
 		log.Debugf("using CCPImageTag from command line %s", request.CCPImageTag)
@@ -777,7 +783,7 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.PrimaryHost = name
 	if request.Policies == "" {
 		spec.Policies = apiserver.Pgo.Cluster.Policies
-		log.Println(apiserver.Pgo.Cluster.Policies + " is Pgo.Cluster.Policies")
+		log.Debugf("Pgo.Cluster.Policies %s", apiserver.Pgo.Cluster.Policies)
 	} else {
 		spec.Policies = request.Policies
 	}
@@ -788,36 +794,41 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 	spec.Database = "userdb"
 	spec.RootPassword = request.Password
 	spec.Replicas = "0"
+	str := apiserver.Pgo.Cluster.Replicas
+	log.Debugf("%s is the pgo.yaml replicas setting", apiserver.Pgo.Cluster.Replicas)
+	if str != "" {
+		spec.Replicas = str
+	}
+	log.Debugf("replica count is %d", request.ReplicaCount)
+	if request.ReplicaCount > 0 {
+		spec.Replicas = strconv.Itoa(request.ReplicaCount)
+		log.Debugf("replicas is  %s", spec.Replicas)
+	}
 	spec.Strategy = "1"
 	spec.UserLabels = userLabelsMap
 	spec.UserLabels[util.LABEL_PGO_VERSION] = msgs.PGO_VERSION
 
 	//override any values from config file
-	str := apiserver.Pgo.Cluster.Port
-	log.Printf("%d", apiserver.Pgo.Cluster.Port)
+	str = apiserver.Pgo.Cluster.Port
+	log.Debugf("%d", apiserver.Pgo.Cluster.Port)
 	if str != "" {
 		spec.Port = str
 	}
 	str = apiserver.Pgo.Cluster.User
-	log.Println(apiserver.Pgo.Cluster.User + " is Pgo.Cluster.User")
+	log.Debugf("Pgo.Cluster.User is %s", apiserver.Pgo.Cluster.User)
 	if str != "" {
 		spec.User = str
 	}
 	str = apiserver.Pgo.Cluster.Database
-	log.Println(apiserver.Pgo.Cluster.Database + " is Pgo.Cluster.Database")
+	log.Debugf("Pgo.Cluster.Database is %s", apiserver.Pgo.Cluster.Database)
 	if str != "" {
 		spec.Database = str
 	}
 	str = apiserver.Pgo.Cluster.Strategy
-	log.Printf("%d", apiserver.Pgo.Cluster.Strategy)
+	log.Debugf("%d", apiserver.Pgo.Cluster.Strategy)
 	if str != "" {
 		spec.Strategy = str
 	}
-	str = apiserver.Pgo.Cluster.Replicas
-	log.Printf("%d", apiserver.Pgo.Cluster.Replicas)
-	if str != "" {
-		spec.Replicas = str
-	}
 	//pass along command line flags for a restore
 	if request.SecretFrom != "" {
 		spec.SecretFrom = request.SecretFrom

apiservermsgs/clustermsgs.go

@@ -32,6 +32,7 @@ type CreateClusterRequest struct {
 	Policies             string
 	CCPImageTag          string
 	Series               int
+	ReplicaCount         int
 	ServiceType          string
 	MetricsFlag          bool
 	BadgerFlag           bool

hugo/content/getting-started/_index.adoc

@@ -168,6 +168,9 @@ The name of a pgpool secret to use for the pgpool configuration.
 |`--policies` |N/A |String |
 The policies to apply when creating a cluster, comma separated.
 
+|`--replica-count` |N/A |Int |
+The number of replicas to create as part of this cluster.  After a cluster is created, you can also add replicas using the scale command.
+
 |`--replica-storage-config` |N/A |String |
 The name of a Storage config in pgo.yaml to use for the cluster replica storage.
 
@@ -193,6 +196,11 @@ Create a single cluster:
 pgo create cluster mycluster
 ....
 
+Create a single cluster with a single replica:
+....
+pgo create cluster mycluster --replica-count=1
+....
+
 ===== Complex Creation
 
 Create a series of clusters, specifying it as the xray project, with the xrayapp and

operator/cluster/cluster.go

@@ -26,9 +26,11 @@ import (
 	"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/util"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+
 	"k8s.io/client-go/rest"
-	//"strconv"
+	"strconv"
 )
 
 // Strategy ....
@@ -224,6 +226,53 @@ func AddClusterBase(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 		AddPgbouncer(clientset, cl, namespace, true)
 	}
 
+	//add replicas if requested
+	if cl.Spec.Replicas != "" {
+		replicaCount, err := strconv.Atoi(cl.Spec.Replicas)
+		if err != nil {
+			log.Error("error in replicas value " + err.Error())
+			return
+		}
+		//create a CRD for each replica
+		for i := 0; i < replicaCount; i++ {
+			spec := crv1.PgreplicaSpec{}
+			//get the resource config
+			//get the storage config
+			spec.ReplicaStorage, _ = operator.Pgo.GetStorageSpec(operator.Pgo.ReplicaStorage)
+
+			spec.UserLabels = cl.Spec.UserLabels
+			labels := make(map[string]string)
+			labels[util.LABEL_PG_CLUSTER] = cl.Spec.Name
+
+			spec.ClusterName = cl.Spec.Name
+			uniqueName := util.RandStringBytesRmndr(4)
+			labels[util.LABEL_NAME] = cl.Spec.Name + "-" + uniqueName
+			spec.Name = labels[util.LABEL_NAME]
+			newInstance := &crv1.Pgreplica{
+				ObjectMeta: meta_v1.ObjectMeta{
+					Name:   labels[util.LABEL_NAME],
+					Labels: labels,
+				},
+				Spec: spec,
+				Status: crv1.PgreplicaStatus{
+					State:   crv1.PgreplicaStateCreated,
+					Message: "Created, not processed yet",
+				},
+			}
+			result := crv1.Pgreplica{}
+
+			err = client.Post().
+				Resource(crv1.PgreplicaResourcePlural).
+				Namespace(namespace).
+				Body(newInstance).
+				Do().Into(&result)
+			if err != nil {
+				log.Error(" in creating Pgreplica instance" + err.Error())
+			}
+
+		}
+	}
+
 }
 
 // DeleteClusterBase ...

pgo/cmd/cluster.go

@@ -169,6 +169,7 @@ func createCluster(args []string) {
 
 	r := new(msgs.CreateClusterRequest)
 	r.Name = args[0]
+	r.ReplicaCount = ReplicaCount
 	r.NodeLabel = NodeLabel
 	r.Password = Password
 	r.SecretFrom = SecretFrom

pgo/cmd/create.go

@@ -245,6 +245,7 @@ func init() {
 	createClusterCmd.Flags().StringVarP(&PoliciesFlag, "policies", "z", "", "The policies to apply when creating a cluster, comma separated.")
 	createClusterCmd.Flags().StringVarP(&CCPImageTag, "ccp-image-tag", "c", "", "The CCPImageTag to use for cluster creation. If specified, overrides the pgo.yaml setting.")
 	createClusterCmd.Flags().IntVarP(&Series, "series", "e", 1, "The number of clusters to create in a series.")
+	createClusterCmd.Flags().IntVarP(&ReplicaCount, "replica-count", "", 0, "The number of replicas to create as part of the cluster.")
 	createClusterCmd.Flags().StringVarP(&ContainerResources, "resources-config", "r", "", "The name of a container resource configuration in pgo.yaml that holds CPU and memory requests and limits.")
 
 	createIngestCmd.Flags().StringVarP(&IngestConfig, "ingest-config", "i", "", "Defines the path of an ingest configuration file.")