fix bug in --secret-from and --password logic

Author: Jeff McCormick

conf/apiserver/pgo.yaml

@@ -54,4 +54,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-3.2
+  COImageTag:  centos7-3.2.0

operator/cluster/cluster.go

@@ -157,9 +157,17 @@ func AddClusterBase(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 	}
 
 	log.Debug("creating Pgcluster object strategy is [" + cl.Spec.Strategy + "]")
+	//allows user to override with their own passwords
+	if cl.Spec.Password != "" {
+		log.Debug("user has set a password, will use that instead of generated ones or the secret-from settings")
+		cl.Spec.RootPassword = cl.Spec.Password
+		cl.Spec.Password = cl.Spec.Password
+		cl.Spec.PrimaryPassword = cl.Spec.Password
+	}
 
 	var err1, err2, err3 error
 	if cl.Spec.SecretFrom != "" {
+		log.Debug("secret-from is specified! using " + cl.Spec.SecretFrom)
 		_, cl.Spec.RootPassword, err1 = util.GetPasswordFromSecret(clientset, namespace, cl.Spec.SecretFrom+crv1.RootSecretSuffix)
 		_, cl.Spec.Password, err2 = util.GetPasswordFromSecret(clientset, namespace, cl.Spec.SecretFrom+crv1.UserSecretSuffix)
 		_, cl.Spec.PrimaryPassword, err3 = util.GetPasswordFromSecret(clientset, namespace, cl.Spec.SecretFrom+crv1.PrimarySecretSuffix)
@@ -169,13 +177,6 @@ func AddClusterBase(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 		}
 	}
 
-	//allows user to override with their own passwords
-	if cl.Spec.Password != "" {
-		cl.Spec.RootPassword = cl.Spec.Password
-		cl.Spec.Password = cl.Spec.Password
-		cl.Spec.PrimaryPassword = cl.Spec.Password
-	}
-
 	var testPassword string
 	_, _, testPassword, err = util.CreateDatabaseSecrets(clientset, client, cl, namespace)
 	if err != nil {

pgo/cmd/restore.go

@@ -48,10 +48,12 @@ var restoreCmd = &cobra.Command{
 				fmt.Println("Error: You must specify the --to-cluster flag.")
 				os.Exit(2)
 			}
+			/**
 			if RestoreOpts == "" {
 				fmt.Println("Error: You must specify the --restore-opts flag.")
 				os.Exit(2)
 			}
+			*/
 			restore(args)
 		}
 
@@ -62,7 +64,7 @@ func init() {
 	RootCmd.AddCommand(restoreCmd)
 
 	restoreCmd.Flags().StringVarP(&ToCluster, "to-cluster", "", "", "The name of the new cluster to restore to.")
-	restoreCmd.Flags().StringVarP(&RestoreOpts, "restore-opts", "", "full", "The options for the restore.")
+	restoreCmd.Flags().StringVarP(&RestoreOpts, "restore-opts", "", "", "The options for the restore.")
 	restoreCmd.Flags().StringVarP(&PITRTarget, "pitr-target", "", "", "The PITR target, being a PostgreSQL timestamp such as '2018-08-13 11:25:42.582117-04'.")
 
 }