fix backup

Author: Jeff McCormick

deploy/cleanup.sh

@@ -14,8 +14,6 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source $DIR/setup.sh
-
 $CO_CMD delete configmap operator-conf
 
 $CO_CMD --namespace=$CO_NAMESPACE delete deployment postgres-operator

operator/backup/backup.go

@@ -19,23 +19,15 @@ import (
 	"bytes"
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
-	"io/ioutil"
-	"text/template"
-	//"time"
-
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/util"
-
-	"k8s.io/client-go/kubernetes"
-
+	"io/ioutil"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	//"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/client-go/kubernetes"
 	v1batch "k8s.io/client-go/pkg/apis/batch/v1"
-	//v1batch "k8s.io/api/batch/v1"
-
 	"k8s.io/client-go/rest"
-	//"k8s.io/client-go/tools/cache"
+	"text/template"
 )
 
 type jobTemplateFields struct {

pgo/cmd/backup.go

@@ -284,13 +284,13 @@ func getBackupParams(name string) (*crv1.Pgbackup, error) {
 	spec.StorageSpec.AccessMode = viper.GetString("BackupStorage.AccessMode")
 	spec.StorageSpec.Size = viper.GetString("BackupStorage.Size")
 	spec.StorageSpec.StorageClass = viper.GetString("BackupStorage.StorageClass")
-	spec.StorageSpec.StorageType = viper.GetString("BackupStorage.StorageTypeg")
+	spec.StorageSpec.StorageType = viper.GetString("BackupStorage.StorageType")
 	spec.StorageSpec.SupplementalGroups = viper.GetString("BackupStorage.SupplementalGroups")
 	spec.StorageSpec.Fsgroup = viper.GetString("BackupStorage.Fsgroup")
 	spec.CCPImageTag = viper.GetString("Cluster.CCPImageTag")
 	spec.BackupStatus = "initial"
 	spec.BackupHost = "basic"
-	spec.BackupUser = "primary"
+	spec.BackupUser = "primaryuser"
 	spec.BackupPass = "password"
 	spec.BackupPort = "5432"