fix bugs in load and reduce spurrious messages

Author: Jeff McCormick

bin/csvload/start.sh

@@ -32,7 +32,6 @@ EOF
 chmod 0600 .pgpass
 export PGPASSFILE=/tmp/.pgpass
 #chown $UID:$UID $PGPASSFILE
-cat $PGPASSFILE
 }
 function ose_hack() {
         export USER_ID=$(id -u)
@@ -50,7 +49,7 @@ echo $CSVFILE_PATH
 
 create_pgpass
 
-
+cat $PGPASSFILE
 
 echo "COPY $TABLE_TO_LOAD  FROM '/pgdata/$CSV_FILE_PATH' WITH (FORMAT csv);" > /tmp/copycommand
 psql -U $DB_USER -h $DB_HOST $DB_DATABASE -f /tmp/copycommand

client/cmd/backup.go

@@ -306,7 +306,7 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
 		spec.BACKUP_HOST = cluster.Spec.Name
 		//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_PASS = GetSecretPassword(cluster.Spec.Name, tpr.PGMASTER_SECRET_SUFFIX)
 		spec.BACKUP_PORT = cluster.Spec.Port
 	} else if errors.IsNotFound(err) {
 		log.Debug(name + " is not a cluster")

client/cmd/load.go

@@ -158,7 +158,7 @@ func getLoadConfigFile() {
 	//LoadConfigTemplate.DB_HOST = viper.GetString("DB_HOST")
 	LoadConfigTemplate.DB_DATABASE = viper.GetString("DB_DATABASE")
 	LoadConfigTemplate.DB_USER = viper.GetString("DB_USER")
-	LoadConfigTemplate.DB_PASS = viper.GetString("DB_PASS")
+	//LoadConfigTemplate.DB_PASS = viper.GetString("DB_PASS")
 	LoadConfigTemplate.DB_PORT = viper.GetString("DB_PORT")
 	LoadConfigTemplate.TABLE_TO_LOAD = viper.GetString("TABLE_TO_LOAD")
 	LoadConfigTemplate.CSV_FILE_PATH = viper.GetString("CSV_FILE_PATH")
@@ -185,6 +185,7 @@ func createJob(clientset *kubernetes.Clientset, clusterName string, namespace st
 
 	LoadConfigTemplate.Name = "csvload-" + clusterName
 	LoadConfigTemplate.DB_HOST = clusterName
+	LoadConfigTemplate.DB_PASS = GetSecretPassword(clusterName, tpr.PGROOT_SECRET_SUFFIX)
 
 	var doc2 bytes.Buffer
 	err = JobTemplate.Execute(&doc2, LoadConfigTemplate)

client/cmd/util.go

@@ -160,7 +160,7 @@ func PrintSecrets(db string) {
 
 }
 
-func GetMasterSecretPassword(db string) string {
+func GetSecretPassword(db, suffix string) string {
 
 	lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + db}
 	secrets, err := Clientset.Secrets(Namespace).List(lo)
@@ -170,7 +170,7 @@ func GetMasterSecretPassword(db string) string {
 	}
 
 	log.Debug("secrets for " + db)
-	secretName := db + tpr.PGMASTER_SECRET_SUFFIX
+	secretName := db + suffix
 	for _, s := range secrets.Items {
 		log.Debug("secret : " + s.ObjectMeta.Name)
 		if s.ObjectMeta.Name == secretName {

examples/sample-load-config.yaml

@@ -1,7 +1,6 @@
 CO_IMAGE_TAG:  centos7-1.5.1
 DB_DATABASE:  userdb
 DB_USER:  postgres
-DB_PASS:  password
 DB_PORT:  5432
 TABLE_TO_LOAD:  xraycsvtable
 CSV_FILE_PATH:  sample.csv

operator/util/secrets.go

@@ -119,7 +119,7 @@ func CreateSecret(clientset *kubernetes.Clientset, db, secretName, username, pas
 	if err != nil {
 		log.Error("error creating secret" + err.Error())
 	} else {
-		log.Info("created secret " + secret.Name)
+		log.Debug("created secret " + secret.Name)
 	}
 
 	return err
@@ -203,7 +203,7 @@ func CopySecrets(clientset *kubernetes.Clientset, namespace string, fromCluster,
 		if err != nil {
 			log.Error("error creating secret" + err.Error())
 		} else {
-			log.Info("created secret " + secret.Name)
+			log.Debug("created secret " + secret.Name)
 		}
 
 	}
@@ -237,15 +237,15 @@ func UpdateUserSecret(clientset *kubernetes.Clientset, clustername, username, pa
 		log.Error("error deleting secret" + err.Error())
 		return err
 	} else {
-		log.Info("deleted secret " + secretName)
+		log.Debug("deleted secret " + secretName)
 	}
 	//create secret with updated password
 	err = CreateUserSecret(clientset, clustername, username, password, namespace)
 	if err != nil {
 		log.Error("error creating secret" + err.Error())
 		return err
 	} else {
-		log.Info("created secret " + secretName)
+		log.Debug("created secret " + secretName)
 	}
 
 	return err
@@ -261,7 +261,7 @@ func DeleteUserSecret(clientset *kubernetes.Clientset, clustername, username, na
 		log.Error("error deleting secret" + err.Error())
 		return err
 	} else {
-		log.Info("deleted secret " + secretName)
+		log.Debug("deleted secret " + secretName)
 	}
 	return err
 }