add client check for valid storage type when doing a restore

Author: Jeff McCormick

client/cmd/backup.go

@@ -17,21 +17,14 @@
 package cmd
 
 import (
-	//"bufio"
-	"bytes"
-	"encoding/json"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"io"
-	"io/ioutil"
 	"k8s.io/client-go/pkg/api"
 	"k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/api/v1"
-	"strings"
-	"text/template"
 	"time"
 )
 
@@ -177,7 +170,7 @@ func createBackup(args []string) {
 			deleteBackup(dels)
 			time.Sleep(2000 * time.Millisecond)
 		} else if errors.IsNotFound(err) {
-			fmt.Println("pgbackup " + arg + " not found so we will create it")
+			log.Debug("pgbackup " + arg + " not found so we will create it")
 		} else {
 			log.Error("error getting pgbackup " + arg)
 			log.Error(err.Error())

client/cmd/cluster.go

@@ -159,6 +159,14 @@ func listServices(name string) {
 func createCluster(args []string) {
 	var err error
 
+	//validate configuration
+	if viper.GetString("MASTER_STORAGE.STORAGE_TYPE") == "existing" {
+		if BackupPVC != "" {
+			log.Error("storage type of existing not allowed when doing a restore")
+			return
+		}
+	}
+
 	for _, arg := range args {
 		log.Debug("create cluster called for " + arg)
 		result := tpr.PgCluster{}
@@ -369,8 +377,8 @@ func validateSecretFrom(secretname string) error {
 	pguserFound := false
 
 	for _, s := range secrets.Items {
-		fmt.Println("")
-		fmt.Println("secret : " + s.ObjectMeta.Name)
+		//fmt.Println("")
+		//fmt.Println("secret : " + s.ObjectMeta.Name)
 		if s.ObjectMeta.Name == secretname+tpr.PGMASTER_SECRET_SUFFIX {
 			pgmasterFound = true
 		} else if s.ObjectMeta.Name == secretname+tpr.PGROOT_SECRET_SUFFIX {

conf/postgres-operator/cluster/1/cluster-deployment-1.json

@@ -9,11 +9,6 @@
     },
     "spec": {
         "replicas": 1,
-        "selector": {
-            "matchLabels": {
-                "name": "{{.Name}}"
-            }
-        },
         "template": {
             "metadata": {
                 "labels": {