fix --password processing on pgo create cluster command

Jeff McCormick · Jeff McCormick · commit acc8bfe7520c · 2018-08-19T15:15:37.000-05:00
diff --git a/apiserver/clusterservice/clusterimpl.go b/apiserver/clusterservice/clusterimpl.go
@@ -726,11 +726,11 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 		spec.Policies = request.Policies
 	}
 
-	spec.PrimaryPassword = ""
+	spec.PrimaryPassword = request.Password
 	spec.User = "testuser"
-	spec.Password = ""
+	spec.Password = request.Password
 	spec.Database = "userdb"
-	spec.RootPassword = ""
+	spec.RootPassword = request.Password
 	spec.Replicas = "0"
 	spec.Strategy = "1"
 	spec.UserLabels = userLabelsMap
diff --git a/conf/apiserver/pgo.yaml b/conf/apiserver/pgo.yaml
@@ -23,6 +23,7 @@ Storage:
     AccessMode:  ReadWriteMany
     Size:  200M
     StorageType:  create
+    SupplementalGroups:  65534
   storage2:
     AccessMode:  ReadWriteOnce
     Size:  333M
diff --git a/operator/cluster/cluster.go b/operator/cluster/cluster.go
@@ -169,6 +169,13 @@ 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 {
@@ -220,7 +227,7 @@ func AddClusterBase(clientset *kubernetes.Clientset, client *rest.RESTClient, cl
 
 }
 
-// eleteClusterBase ...
+// DeleteClusterBase ...
 func DeleteClusterBase(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *crv1.Pgcluster, namespace string) {
 
 	log.Debug("deleteCluster called with strategy " + cl.Spec.Strategy)

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,13 @@ func AddClusterBase(clientset kubernetes.Clientset, client rest.RESTClient, cl`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
	`172`	`+ //allows user to override with their own passwords`
	`173`	`+ if cl.Spec.Password != "" {`
	`174`	`+ cl.Spec.RootPassword = cl.Spec.Password`
	`175`	`+ cl.Spec.Password = cl.Spec.Password`
	`176`	`+ cl.Spec.PrimaryPassword = cl.Spec.Password`
	`177`	`+ }`
	`178`	`+`
`172`	`179`	`var testPassword string`
`173`	`180`	`_, _, testPassword, err = util.CreateDatabaseSecrets(clientset, client, cl, namespace)`
`174`	`181`	`if err != nil {`
`@@ -220,7 +227,7 @@ func AddClusterBase(clientset kubernetes.Clientset, client rest.RESTClient, cl`
`220`	`227`
`221`	`228`	`}`
`222`	`229`
`223`		`-// eleteClusterBase ...`
	`230`	`+// DeleteClusterBase ...`
`224`	`231`	`func DeleteClusterBase(clientset kubernetes.Clientset, client rest.RESTClient, cl *crv1.Pgcluster, namespace string) {`
`225`	`232`
`226`	`233`	`log.Debug("deleteCluster called with strategy " + cl.Spec.Strategy)`