fix pgo show backup when PVC_NAME is not set in config

Author: Jeff McCormick

client/cmd/backup.go

@@ -51,18 +51,19 @@ func showBackup(args []string) {
 				return
 			}
 			for _, pod := range pods.Items {
-				showItem(pod.Name, "crunchy-pvc")
+				showItem(pod.Name)
 			}
 
 		} else {
-			showItem(arg, "crunchy-pvc")
+			showItem(arg)
 
 		}
 
 	}
 
 }
-func showItem(name string, pvcName string) {
+func showItem(name string ) {
+	var pvcName string
 	//print the pgbackups TPR
 	result := tpr.PgBackup{}
 	err := Tprclient.Get().
@@ -72,12 +73,24 @@ func showItem(name string, pvcName string) {
 		Do().
 		Into(&result)
 	if err == nil {
-		fmt.Printf("\npgbackup %s\n", name+" was found ")
+		if result.Spec.PVC_NAME == "" {
+			pvcName = name + "-backup-pvc"
+		} else {
+			pvcName = result.Spec.PVC_NAME
+		}
+		fmt.Printf("\npgbackup %s\n", name+" was found PVC_NAME is " + pvcName)
 	} else if errors.IsNotFound(err) {
-		fmt.Printf("\npgbackup %s\n", name+" was not found ")
+		configPVC := viper.GetString("DB.PVC_NAME") 
+		if configPVC == "" {
+			pvcName = name + "-backup-pvc"
+		} else {
+			pvcName = configPVC
+		}
+		fmt.Printf("\npgbackup %s\n", name+" was not found assuming PVC_NAME is " + pvcName)
 	} else {
 		log.Errorf("\npgbackup %s\n", name+" lookup error ")
 		log.Error(err.Error())
+		return
 	}
 
 	//print the backup jobs if any exists
@@ -197,7 +210,9 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
 
 	spec := tpr.PgBackupSpec{}
 	spec.Name = name
-	spec.PVC_NAME = "crunchy-pvc"
+	spec.PVC_NAME = viper.GetString("PVC_NAME")
+	spec.PVC_ACCESS_MODE = viper.GetString("DB.PVC_ACCESS_MODE")
+	spec.PVC_SIZE = viper.GetString("DB.PVC_SIZE")
 	spec.CCP_IMAGE_TAG = viper.GetString("DB.CCP_IMAGE_TAG")
 	spec.BACKUP_HOST = "basic"
 	spec.BACKUP_USER = "master"
@@ -214,8 +229,6 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
 		Into(&db)
 	if err == nil {
 		fmt.Println(name + " is a database")
-		spec.PVC_NAME = db.Spec.PVC_NAME
-		spec.CCP_IMAGE_TAG = db.Spec.CCP_IMAGE_TAG
 		spec.BACKUP_HOST = db.Spec.Name
 		spec.BACKUP_USER = db.Spec.PG_MASTER_USER
 		spec.BACKUP_PASS = db.Spec.PG_MASTER_PASSWORD
@@ -231,8 +244,6 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
 			Into(&cluster)
 		if err == nil {
 			fmt.Println(name + " is a cluster")
-			spec.PVC_NAME = cluster.Spec.PVC_NAME
-			spec.CCP_IMAGE_TAG = cluster.Spec.CCP_IMAGE_TAG
 			spec.BACKUP_HOST = cluster.Spec.Name
 			spec.BACKUP_USER = cluster.Spec.PG_MASTER_USER
 			spec.BACKUP_PASS = cluster.Spec.PG_MASTER_PASSWORD

client/cmd/database.go

@@ -136,7 +136,7 @@ func getDatabaseParams(name string) *tpr.PgDatabase {
 	str = viper.GetString("DB.PVC_NAME")
 	if str != "" {
 		spec.PVC_NAME = str
-	}
+	} 
 	str = viper.GetString("DB.PVC_SIZE")
 	if str != "" {
 		spec.PVC_SIZE = str

docs/user-guide.asciidoc

@@ -132,9 +132,7 @@ pgo delete cluster mycluster
 ....
 
 *Note*, when you delete a database or cluster, the operator
-will delete the unique PVC that pertains to the database if one
-exists.  This is the case when you specify a PVC to be created
-for a database instead of using a shared PVC configuration.
+will NOT delete any associated PVCs used by the cluster or database.
 
 
 == Viewing PVC Information

operator/backup/backup.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/crunchydata/postgres-operator/tpr"
+	"github.com/crunchydata/postgres-operator/operator/pvc"
 
 	"k8s.io/client-go/kubernetes"
 
@@ -113,9 +114,22 @@ func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan
 }
 
 func addBackup(clientset *kubernetes.Clientset, client *rest.RESTClient, job *tpr.PgBackup) {
+	var err error
 	log.Info("creating PgBackup object")
 	log.Info("created with Name=" + job.Spec.Name)
 
+	//create the PVC if necessary
+	if job.Spec.PVC_NAME == "" {
+		job.Spec.PVC_NAME = job.Spec.Name + "-backup-pvc"
+  		err = pvc.Create(clientset, job.Spec.PVC_NAME, job.Spec.PVC_ACCESS_MODE, job.Spec.PVC_SIZE)
+                if err != nil {
+                        log.Error(err.Error())
+                        return
+                }
+                log.Info("created backup PVC =" + job.Spec.PVC_NAME)
+
+	}
+
 	//create the job -
 	jobFields := JobTemplateFields{
 		Name:          job.Spec.Name,
@@ -128,7 +142,7 @@ func addBackup(clientset *kubernetes.Clientset, client *rest.RESTClient, job *tp
 	}
 
 	var doc2 bytes.Buffer
-	err := JobTemplate.Execute(&doc2, jobFields)
+	err = JobTemplate.Execute(&doc2, jobFields)
 	if err != nil {
 		log.Error(err.Error())
 		return

operator/database/database_strategy_1.go

@@ -21,7 +21,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"text/template"
 
-	"github.com/crunchydata/postgres-operator/operator/pvc"
+	//"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/operator/util"
 	"github.com/crunchydata/postgres-operator/tpr"
 
@@ -150,11 +150,13 @@ func (r DatabaseStrategy1) DeleteDatabase(clientset *kubernetes.Clientset, clien
 	}
 	log.Info("deleted pod " + db.Spec.Name)
 
+/**
 	err = pvc.Delete(clientset, db.Spec.Name+"-pvc")
 	if err != nil {
 		log.Error("error deleting pvc " + err.Error())
 		return err
 	}
+*/
 	return err
 
 }

tpr/types.go

@@ -177,6 +177,8 @@ func (el *PgClusterList) UnmarshalJSON(data []byte) error {
 type PgBackupSpec struct {
 	Name          string `json:"name"`
 	PVC_NAME      string `json:"pvcname"`
+	PVC_ACCESS_MODE      string `json:"pvcaccessmode"`
+	PVC_SIZE      string `json:"pvcsize"`
 	CCP_IMAGE_TAG string `json:"ccpimagetag"`
 	BACKUP_HOST   string `json:"backuphost"`
 	BACKUP_USER   string `json:"backupuser"`