fix backup to use master secret password

Author: Jeff McCormick

client/cmd/backup.go

@@ -268,8 +268,9 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
 		Into(&cluster)
 	if err == nil {
 		spec.BACKUP_HOST = cluster.Spec.Name
-		spec.BACKUP_USER = cluster.Spec.PG_MASTER_USER
-		spec.BACKUP_PASS = cluster.Spec.PG_MASTER_PASSWORD
+		//spec.BACKUP_USER = cluster.Spec.PG_MASTER_USER
+		//spec.BACKUP_PASS = cluster.Spec.PG_MASTER_PASSWORD
+		spec.BACKUP_PASS = GetMasterSecretPassword(cluster.Spec.Name)
 		spec.BACKUP_PORT = cluster.Spec.Port
 	} else if errors.IsNotFound(err) {
 		log.Debug(name + " is not a cluster")

client/cmd/util.go

@@ -142,3 +142,27 @@ func PrintSecrets(db string) {
 	}
 
 }
+
+func GetMasterSecretPassword(db string) string {
+
+	lo := v1.ListOptions{LabelSelector: "pg-database=" + db}
+	secrets, err := Clientset.Secrets(Namespace).List(lo)
+	if err != nil {
+		log.Error("error getting list of secrets" + err.Error())
+		return "error"
+	}
+
+	log.Debug("secrets for " + db)
+	secretName := db + "-pgmaster-secret"
+	for _, s := range secrets.Items {
+		log.Debug("secret : " + s.ObjectMeta.Name)
+		if s.ObjectMeta.Name == secretName {
+			log.Debug("pgmaster password found")
+			return string(s.Data["password"][:])
+		}
+	}
+
+	log.Error("master secret not found for " + db)
+	return "error"
+
+}

docs/build.asciidoc

@@ -197,7 +197,7 @@ the following:
  * create a cluster (*pgo create cluster testcluster*)
  * show a cluster (*pgo show cluster testcluster*)
  * show all clusters (*pgo show cluster all*)
- * backup a cluster (*pgo create backup testcluster*)
+ * backup a cluster (*pgo backup testcluster*)
  * show backup of cluster (*pgo show backup testcluster*)
  * delete a cluster (*pgo delete cluster testcluster*)
  * restore a cluster (*pgo create cluster restoredcluster --backup-pvc=testcluster-backup-pvc --backup-path=testcluster-backups/2017-01-01-01-01-01*)

examples/operator/create-pv.sh

@@ -18,7 +18,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo "create the test PV and PVC using the HostPath dir"
 for i in {1..60}
 do
-   	echo "creating PV crunchy-pv-$i"
+   	echo "creating PV crunchy-pv$i"
 	export COUNTER=$i
+	kubectl --namespace=$NAMESPACE delete pv crunchy-pv$i
 	envsubst < $DIR/crunchy-pv.json | kubectl --namespace=$NAMESPACE create -f -
 done