fix various pgo output formatting issues and bug in pgo show pvc output

Author: Jeff McCormick

client/cmd/cluster.go

@@ -36,11 +36,19 @@ func showCluster(args []string) {
 		return
 	}
 
+	if len(clusterList.Items) == 0 {
+		fmt.Println("no clusters found")
+		return
+	}
+
+	itemFound := false
+
 	//each arg represents a cluster name or the special 'all' value
 	for _, arg := range args {
 		for _, cluster := range clusterList.Items {
 			fmt.Println("")
 			if arg == "all" || cluster.Spec.Name == arg {
+				itemFound = true
 				if PostgresVersion == "" || (PostgresVersion != "" && cluster.Spec.POSTGRES_FULL_VERSION == PostgresVersion) {
 					fmt.Println("cluster : " + cluster.Spec.Name + " (" + cluster.Spec.POSTGRES_FULL_VERSION + ")")
 					log.Debug("listing cluster " + arg)
@@ -58,6 +66,10 @@ func showCluster(args []string) {
 				}
 			}
 		}
+		if !itemFound {
+			fmt.Println(arg + " was not found")
+		}
+		itemFound = false
 	}
 
 }

client/cmd/create.go

@@ -35,7 +35,7 @@ pgo create cluster
 .`,
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Debug("create called")
-		if len(args) == 0 {
+		if len(args) == 0 || args[0] != "cluster" {
 			fmt.Println(`You must specify the type of resource to create.  Valid resource types include:
 	* cluster`)
 		}

client/cmd/pvc.go

@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
+	"github.com/crunchydata/postgres-operator/operator/util"
 	"github.com/spf13/viper"
 	"io"
 	"io/ioutil"
@@ -51,13 +52,13 @@ func printPVC(pvcName string) {
 		fmt.Printf("\nPVC %s\n", pvcName+" is not found")
 		fmt.Println(err.Error())
 	} else {
-		fmt.Printf("\nPVC %s\n", pvc.Name+" is found")
-		printPVCListing(pvc.Name)
+		log.Debug("\nPVC %s\n", pvc.Name+" is found")
+		PrintPVCListing(pvc.Name)
 	}
 
 }
 
-func printPVCListing(pvcName string) {
+func PrintPVCListing(pvcName string) {
 	var POD_PATH = viper.GetString("PGO.LSPVC_TEMPLATE")
 	var PodTemplate *template.Template
 	var err error
@@ -91,10 +92,19 @@ func printPVCListing(pvcName string) {
 	}
 	PodTemplate = template.Must(template.New("pod template").Parse(string(buf)))
 
+	pvcRoot := "/"
+	if PVCRoot != "" {
+		log.Debug("using " + PVCRoot + " as the PVC listing root")
+		pvcRoot = PVCRoot
+		fmt.Println(pvcName + "/" + pvcRoot)
+	} else {
+		fmt.Println(pvcName)
+	}
+
 	podFields := PodTemplateFields{
 		Name:         podName,
 		CO_IMAGE_TAG: viper.GetString("PGO.CO_IMAGE_TAG"),
-		BACKUP_ROOT:  "/",
+		BACKUP_ROOT:  pvcRoot,
 		PVC_NAME:     pvcName,
 	}
 
@@ -122,8 +132,13 @@ func printPVCListing(pvcName string) {
 	}
 	log.Debug("created pod " + resultPod.Name)
 
-	//sleep a bit for the pod to finish, replace later with watch or better
-	time.Sleep(3000 * time.Millisecond)
+	timeout := time.Duration(6 * time.Second)
+	lo := v1.ListOptions{LabelSelector: "name=lspvc,pvcname=" + pvcName}
+	podPhase := v1.PodSucceeded
+	err = util.WaitUntilPod(Clientset, lo, podPhase, timeout, Namespace)
+	if err != nil {
+		log.Error("error waiting on lspvc pod to complete" + err.Error())
+	}
 
 	//get lspvc pod output
 	logOptions := v1.PodLogOptions{}

client/cmd/show.go

@@ -26,6 +26,7 @@ const TREE_TRUNK = "└── "
 var PostgresVersion string
 var ShowPVC bool
 var ShowSecrets bool
+var PVCRoot string
 
 // ShowCmd represents the show command
 var ShowCmd = &cobra.Command{
@@ -84,6 +85,7 @@ func init() {
 
 	ShowClusterCmd.Flags().BoolVarP(&ShowSecrets, "show-secrets", "s", false, "Show secrets ")
 	ShowClusterCmd.Flags().StringVarP(&PostgresVersion, "version", "v", "", "The postgres version to filter on")
+	ShowPVCCmd.Flags().StringVarP(&PVCRoot, "pvc-root", "r", "", "The PVC directory to list")
 
 	ShowBackupCmd.Flags().BoolVarP(&ShowPVC, "show-pvc", "p", false, "Show backup archive PVC listing ")
 

client/cmd/upgrade.go

@@ -174,15 +174,16 @@ func createUpgrade(args []string) {
 			Do().
 			Into(&result)
 		if err == nil {
-			fmt.Println("pgupgrade " + arg + " was found so we will not create it")
+			log.Debug("pgupgrade " + arg + " was found so we will not create it")
 			break
 		} else if kerrors.IsNotFound(err) {
-			fmt.Println("pgupgrade " + arg + " not found so we will create it")
+			log.Debug("pgupgrade " + arg + " not found so we will create it")
 		} else {
 			log.Error("error getting pgupgrade " + arg)
 			log.Error(err.Error())
 			break
 		}
+
 		// Create an instance of our TPR
 		newInstance, err = getUpgradeParams(arg)
 		if err == nil {
@@ -193,8 +194,9 @@ func createUpgrade(args []string) {
 				Do().Into(&result)
 			if err != nil {
 				log.Error("error in creating PgUpgrade TPR instance", err.Error())
+			} else {
+				fmt.Println("created PgUpgrade " + arg)
 			}
-			fmt.Println("created PgUpgrade " + arg)
 		}
 
 	}

examples/.pgo.lspvc-template.json

@@ -4,7 +4,8 @@
     "metadata": {
         "name": "{{.Name}}",
         "labels": {
-            "name": "lspvc"
+            "name": "lspvc",
+            "pvcname": "{{.PVC_NAME}}"
         }
     },
     "spec": {

examples/operator/create-pv.sh

@@ -16,7 +16,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 echo "create the test PV and PVC using the HostPath dir"
-for i in {16..20}
+for i in {1..60}
 do
    	echo "creating PV crunchy-pv-$i"
 	export COUNTER=$i

operator/cluster/cluster.go

@@ -27,6 +27,7 @@ import (
 	"github.com/crunchydata/postgres-operator/tpr"
 
 	"k8s.io/client-go/kubernetes"
+	kerrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/fields"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
@@ -209,6 +210,27 @@ func deleteCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 	}
 	strategy.DeleteCluster(clientset, client, cl, namespace)
 	util.DeleteDatabaseSecrets(clientset, cl.Spec.Name, namespace)
+	//remove the backup PVC if exists
+	pvcName := cl.Spec.Name + "-backup-pvc-empty"
+	err := pvc.Delete(clientset, pvcName, namespace)
+	if err != nil {
+		log.Error("error deleting pvc " + pvcName)
+	}
+	//delete any upgrade for this cluster
+	err = client.Delete().
+		Resource("pgupgrades").
+		Namespace(namespace).
+		Name(cl.Spec.Name).
+		Do().
+		Error()
+	if err == nil {
+		log.Info("deleted pgupgrade " + cl.Spec.Name)
+	} else if kerrors.IsNotFound(err) {
+		log.Info("will not delete pgupgrade, not found for " + cl.Spec.Name)
+	} else {
+		log.Error("error deleting pgupgrade " + cl.Spec.Name)
+		log.Error(err.Error())
+	}
 
 }
 

operator/util/waituntil.go

@@ -39,9 +39,9 @@ func WaitUntilPod(clientset *kubernetes.Clientset, lo v1.ListOptions, podPhase v
 
 	conditions := []watch.ConditionFunc{
 		func(event watch.Event) (bool, error) {
-			log.Info("watch Modified called")
+			log.Debug("watch Modified called")
 			gotpod2 := event.Object.(*v1.Pod)
-			log.Info("pod2 phase=" + gotpod2.Status.Phase)
+			log.Debug("pod2 phase=" + gotpod2.Status.Phase)
 			if gotpod2.Status.Phase == podPhase {
 				return true, nil
 			}
@@ -50,7 +50,7 @@ func WaitUntilPod(clientset *kubernetes.Clientset, lo v1.ListOptions, podPhase v
 		},
 	}
 
-	log.Info("before watch.Until")
+	log.Debug("before watch.Until")
 
 	var lastEvent *watch.Event
 	lastEvent, err = watch.Until(timeout, fw, conditions...)
@@ -62,7 +62,7 @@ func WaitUntilPod(clientset *kubernetes.Clientset, lo v1.ListOptions, podPhase v
 		log.Error("expected event")
 		return err
 	}
-	log.Info("after watch.Until")
+	log.Debug("after watch.Until")
 	return err
 
 }
@@ -83,7 +83,7 @@ func WaitUntilPodIsDeleted(clientset *kubernetes.Clientset, podname string, time
 	conditions := []watch.ConditionFunc{
 		func(event watch.Event) (bool, error) {
 			if event.Type == watch.Deleted {
-				log.Info("pod delete event received in WaitUntilPodIsDeleted")
+				log.Debug("pod delete event received in WaitUntilPodIsDeleted")
 				return true, nil
 			}
 			return false, nil