minor tweaks

Author: Jeff McCormick

centos7/Dockerfile.postgres-operator.centos7

@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="1.3.2" Vendor="Crunchy Data Solutions" 
+LABEL Release="1.4" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 

client/cmd/apply.go

@@ -21,6 +21,7 @@ import (
 )
 
 var Selector string
+var DryRun bool
 
 var applyCmd = &cobra.Command{
 	Use:   "apply",
@@ -30,6 +31,7 @@ For example:
 
 pgo apply mypolicy1 --selector=name=mycluster
 pgo apply mypolicy1 --selector=someotherpolicy
+pgo apply mypolicy1 --selector=someotherpolicy --dry-run
 .`,
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Debug("apply called")
@@ -49,5 +51,6 @@ func init() {
 	RootCmd.AddCommand(applyCmd)
 
 	applyCmd.Flags().StringVarP(&Selector, "selector", "s", "", "The selector to use for cluster filtering ")
+	applyCmd.Flags().BoolVarP(&DryRun, "dry-run", "d", false, "--dry-run shows clusters that policy would be applied to but does not actually apply them")
 
 }

client/cmd/clone.go

@@ -107,7 +107,7 @@ func createClone(clusterName string) {
 		log.Error(err.Error())
 		return
 	}
-	fmt.Println("created PgClone " + clusterName)
+	fmt.Println("cloned " + clusterName + " as " + CloneName)
 
 }
 

client/cmd/policy.go

@@ -254,6 +254,14 @@ func applyPolicy(policies []string) {
 		return
 	}
 
+	if DryRun {
+		fmt.Println("policy would be applied to the following clusters:")
+		for _, d := range deployments.Items {
+			fmt.Println("deployment : " + d.ObjectMeta.Name)
+		}
+		return
+	}
+
 	var newInstance *tpr.PgPolicylog
 	for _, d := range deployments.Items {
 		fmt.Println("deployment : " + d.ObjectMeta.Name)
@@ -263,6 +271,23 @@ func applyPolicy(policies []string) {
 			newInstance, err = getPolicylog(p, d.ObjectMeta.Name)
 
 			result := tpr.PgPolicylog{}
+			err = Tprclient.Get().
+				Resource(tpr.POLICY_LOG_RESOURCE).
+				Namespace(Namespace).
+				Name(newInstance.Metadata.Name).
+				Do().Into(&result)
+			if err == nil {
+				fmt.Println(p + " already applied to " + d.ObjectMeta.Name)
+				break
+			} else {
+				if kerrors.IsNotFound(err) {
+				} else {
+					log.Error(err)
+					break
+				}
+			}
+
+			result = tpr.PgPolicylog{}
 			err = Tprclient.Post().
 				Resource(tpr.POLICY_LOG_RESOURCE).
 				Namespace(Namespace).

docs/build.asciidoc

@@ -287,6 +287,7 @@ A simple *smoke test* of the postgres operator includes testing
 the following:
 
  * create a cluster (*pgo create cluster testcluster*)
+ * scale a cluster (*pgo scale testcluster --replica-count=1*)
  * show a cluster (*pgo show cluster testcluster*)
  * show all clusters (*pgo show cluster all*)
  * backup a cluster (*pgo backup testcluster*)
@@ -299,6 +300,9 @@ the following:
  * clone a cluster (*pgo clone testcluster --name=cloneexample*)
  * delete a cluster (*pgo delete cluster testcluster*)
  * create a policy from local file (*pgo create policy policy1 --in-file=./examples/policy/policy1.sql*)
- * create a policy from git repo (*pgo create policy gitpolicy --repo=https://github.com/CrunchyData/postgres-operator/blob/master/examples/policy/gitpolicy.sql*)
+ * create a policy from git repo (*pgo create policy gitpolicy --url=https://github.com/CrunchyData/postgres-operator/blob/master/examples/policy/gitpolicy.sql*)
+ * repeat testing using emptydir storage type
+ * repeat testing using create storage type
+ * repeat testing using existing storage type
 
 More detailed explanations of the commands can be found in the link:user-guide.asciidoc[User Guide].

examples/.pgo.yaml

@@ -25,5 +25,5 @@ REPLICA_STORAGE:
   STORAGE_TYPE:  emptydir
 PGO:
   LSPVC_TEMPLATE:  /home/jeffmc/.pgo.lspvc-template.json
-  CO_IMAGE_TAG:  centos7-1.3.2
+  CO_IMAGE_TAG:  centos7-1.4
   DEBUG:  false

operator/cluster/clone.go

@@ -128,6 +128,8 @@ func addClone(clientset *kubernetes.Clientset, tprclient *rest.RESTClient, clone
 
 func CompleteClone(config *rest.Config, clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan chan struct{}, namespace string) {
 
+	log.Debug("setting up clone Deployment watch")
+
 	lo := v1.ListOptions{LabelSelector: "clone"}
 	fw, err := clientset.Extensions().Deployments(namespace).Watch(lo)
 	if err != nil {

operator/cluster/cluster.go

@@ -137,34 +137,6 @@ func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *tp
 		return
 	}
 
-	//create the PVC for the master if required
-	//var pvcName string
-	/**
-
-	switch cl.Spec.MasterStorage.StorageType {
-	case "":
-		log.Debug("MasterStorage.StorageType is empty")
-	case "emptydir":
-		log.Debug("MasterStorage.StorageType is emptydir")
-	case "existing":
-		log.Debug("MasterStorage.StorageType is existing")
-		pvcName = cl.Spec.MasterStorage.PvcName
-	case "create":
-		log.Debug("MasterStorage.StorageType is create")
-		pvcName = cl.Spec.Name + "-pvc"
-		log.Debug("PVC_NAME=%s PVC_SIZE=%s PVC_ACCESS_MODE=%s\n",
-			pvcName, cl.Spec.MasterStorage.PvcAccessMode, cl.Spec.MasterStorage.PvcSize)
-		err = pvc.Create(clientset, pvcName, cl.Spec.MasterStorage.PvcAccessMode, cl.Spec.MasterStorage.PvcSize, cl.Spec.MasterStorage.StorageType, cl.Spec.MasterStorage.StorageClass, namespace)
-		if err != nil {
-			log.Error("error in pvc create " + err.Error())
-			return
-		}
-		log.Info("created PVC =" + pvcName + " in namespace " + namespace)
-	case "dynamic":
-		log.Debug("MasterStorage.StorageType is dynamic, not supported yet")
-	}
-	*/
-
 	pvcName, err := createPVC(clientset, cl.Spec.Name, &cl.Spec.MasterStorage, namespace)
 	log.Debug("created master pvc [" + pvcName + "]")
 
@@ -300,7 +272,7 @@ func AddUpgrade(clientset *kubernetes.Clientset, client *rest.RESTClient, upgrad
 
 func updateCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *tpr.PgCluster, oldcluster *tpr.PgCluster, namespace string) {
 
-	log.Debug("updateCluster on pgcluster called..something changed")
+	//log.Debug("updateCluster on pgcluster called..something changed")
 
 	if oldcluster.Spec.REPLICAS != cl.Spec.REPLICAS {
 		log.Debug("detected change to REPLICAS for " + cl.Spec.Name + " from " + oldcluster.Spec.REPLICAS + " to " + cl.Spec.REPLICAS)
@@ -320,15 +292,29 @@ func updateCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 		}
 		newReps := newCount - oldCount
 		if newReps > 0 {
-			ScaleReplicas(clientset, cl, newReps, namespace)
+			serviceName := cl.Spec.Name + "-replica"
+			ScaleReplicas(serviceName, clientset, cl, newReps, namespace)
 		} else {
 			log.Error("scale to the same number does nothing")
 		}
 	}
 
 }
 
-func ScaleReplicas(clientset *kubernetes.Clientset, cl *tpr.PgCluster, newReplicas int, namespace string) {
+func ScaleReplicas(serviceName string, clientset *kubernetes.Clientset, cl *tpr.PgCluster, newReplicas int, namespace string) {
+
+	//create the service if it doesn't exist
+	serviceFields := ServiceTemplateFields{
+		Name:        serviceName,
+		ClusterName: cl.Spec.Name,
+		Port:        cl.Spec.Port,
+	}
+
+	err := CreateService(clientset, &serviceFields, namespace)
+	if err != nil {
+		log.Error(err)
+		return
+	}
 
 	//get the strategy to use
 	if cl.Spec.STRATEGY == "" {
@@ -357,19 +343,19 @@ func ScaleReplicas(clientset *kubernetes.Clientset, cl *tpr.PgCluster, newReplic
 			log.Error(err)
 			return
 		}
-		//create a Deployment and its service
-		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
-		}
+		//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

@@ -123,7 +123,20 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 	if err != nil {
 		log.Error("could not convert REPLICAS config setting")
 	} else {
-		ScaleReplicas(clientset, cl, newReplicas, namespace)
+		//create the replica service
+		serviceName := cl.Spec.Name + "-replica"
+		repserviceFields := ServiceTemplateFields{
+			Name:        serviceName,
+			ClusterName: cl.Spec.Name,
+			Port:        cl.Spec.Port,
+		}
+
+		err = CreateService(clientset, &repserviceFields, namespace)
+		if err != nil {
+			log.Error("error in creating replica service " + err.Error())
+			return err
+		}
+		ScaleReplicas(serviceName, clientset, cl, newReplicas, namespace)
 	}
 
 	return err