Skip to content

Commit b510f15

Browse files
author
Jeff McCormick
committed
fix bugs in load and reduce spurrious messages
1 parent da26481 commit b510f15

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

‎bin/csvload/start.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ EOF
3232
chmod 0600 .pgpass
3333
export PGPASSFILE=/tmp/.pgpass
3434
#chown $UID:$UID $PGPASSFILE
35-
cat $PGPASSFILE
3635
}
3736
function ose_hack() {
3837
export USER_ID=$(id -u)
@@ -50,7 +49,7 @@ echo $CSVFILE_PATH
5049

5150
create_pgpass
5251

53-
52+
cat $PGPASSFILE
5453

5554
echo "COPY $TABLE_TO_LOAD FROM '/pgdata/$CSV_FILE_PATH' WITH (FORMAT csv);" > /tmp/copycommand
5655
psql -U $DB_USER -h $DB_HOST $DB_DATABASE -f /tmp/copycommand

‎client/cmd/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func getBackupParams(name string) (*tpr.PgBackup, error) {
306306
spec.BACKUP_HOST = cluster.Spec.Name
307307
//spec.BACKUP_USER = cluster.Spec.PG_MASTER_USER
308308
//spec.BACKUP_PASS = cluster.Spec.PG_MASTER_PASSWORD
309-
spec.BACKUP_PASS = GetMasterSecretPassword(cluster.Spec.Name)
309+
spec.BACKUP_PASS = GetSecretPassword(cluster.Spec.Name, tpr.PGMASTER_SECRET_SUFFIX)
310310
spec.BACKUP_PORT = cluster.Spec.Port
311311
} else if errors.IsNotFound(err) {
312312
log.Debug(name + " is not a cluster")

‎client/cmd/load.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func getLoadConfigFile() {
158158
//LoadConfigTemplate.DB_HOST = viper.GetString("DB_HOST")
159159
LoadConfigTemplate.DB_DATABASE = viper.GetString("DB_DATABASE")
160160
LoadConfigTemplate.DB_USER = viper.GetString("DB_USER")
161-
LoadConfigTemplate.DB_PASS = viper.GetString("DB_PASS")
161+
//LoadConfigTemplate.DB_PASS = viper.GetString("DB_PASS")
162162
LoadConfigTemplate.DB_PORT = viper.GetString("DB_PORT")
163163
LoadConfigTemplate.TABLE_TO_LOAD = viper.GetString("TABLE_TO_LOAD")
164164
LoadConfigTemplate.CSV_FILE_PATH = viper.GetString("CSV_FILE_PATH")
@@ -185,6 +185,7 @@ func createJob(clientset *kubernetes.Clientset, clusterName string, namespace st
185185

186186
LoadConfigTemplate.Name = "csvload-" + clusterName
187187
LoadConfigTemplate.DB_HOST = clusterName
188+
LoadConfigTemplate.DB_PASS = GetSecretPassword(clusterName, tpr.PGROOT_SECRET_SUFFIX)
188189

189190
var doc2 bytes.Buffer
190191
err = JobTemplate.Execute(&doc2, LoadConfigTemplate)

‎client/cmd/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func PrintSecrets(db string) {
160160

161161
}
162162

163-
func GetMasterSecretPassword(db string) string {
163+
func GetSecretPassword(db, suffix string) string {
164164

165165
lo := meta_v1.ListOptions{LabelSelector: "pg-database=" + db}
166166
secrets, err := Clientset.Secrets(Namespace).List(lo)
@@ -170,7 +170,7 @@ func GetMasterSecretPassword(db string) string {
170170
}
171171

172172
log.Debug("secrets for " + db)
173-
secretName := db + tpr.PGMASTER_SECRET_SUFFIX
173+
secretName := db + suffix
174174
for _, s := range secrets.Items {
175175
log.Debug("secret : " + s.ObjectMeta.Name)
176176
if s.ObjectMeta.Name == secretName {

‎examples/sample-load-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CO_IMAGE_TAG: centos7-1.5.1
22
DB_DATABASE: userdb
33
DB_USER: postgres
4-
DB_PASS: password
54
DB_PORT: 5432
65
TABLE_TO_LOAD: xraycsvtable
76
CSV_FILE_PATH: sample.csv

‎operator/util/secrets.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func CreateSecret(clientset *kubernetes.Clientset, db, secretName, username, pas
119119
if err != nil {
120120
log.Error("error creating secret" + err.Error())
121121
} else {
122-
log.Info("created secret " + secret.Name)
122+
log.Debug("created secret " + secret.Name)
123123
}
124124

125125
return err
@@ -203,7 +203,7 @@ func CopySecrets(clientset *kubernetes.Clientset, namespace string, fromCluster,
203203
if err != nil {
204204
log.Error("error creating secret" + err.Error())
205205
} else {
206-
log.Info("created secret " + secret.Name)
206+
log.Debug("created secret " + secret.Name)
207207
}
208208

209209
}
@@ -237,15 +237,15 @@ func UpdateUserSecret(clientset *kubernetes.Clientset, clustername, username, pa
237237
log.Error("error deleting secret" + err.Error())
238238
return err
239239
} else {
240-
log.Info("deleted secret " + secretName)
240+
log.Debug("deleted secret " + secretName)
241241
}
242242
//create secret with updated password
243243
err = CreateUserSecret(clientset, clustername, username, password, namespace)
244244
if err != nil {
245245
log.Error("error creating secret" + err.Error())
246246
return err
247247
} else {
248-
log.Info("created secret " + secretName)
248+
log.Debug("created secret " + secretName)
249249
}
250250

251251
return err
@@ -261,7 +261,7 @@ func DeleteUserSecret(clientset *kubernetes.Clientset, clustername, username, na
261261
log.Error("error deleting secret" + err.Error())
262262
return err
263263
} else {
264-
log.Info("deleted secret " + secretName)
264+
log.Debug("deleted secret " + secretName)
265265
}
266266
return err
267267
}

0 commit comments

Comments
 (0)