public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into client-go-v4

This commit is contained in:
Murat Kabilov 2017-07-17 12:27:27 +02:00
parent 820ce85d4d 4f36e447c3
commit 51672b9e79
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/pod.go
View File

@ -141,8 +141,7 @@ func (c *Cluster) recreatePods() error {
} }
if masterPod.Name == "" { if masterPod.Name == "" {
c.logger.Warningln("No master pod in the cluster") c.logger.Warningln("No master pod in the cluster")
} } else {
//TODO: do manual failover //TODO: do manual failover
//TODO: specify master, leave new master empty //TODO: specify master, leave new master empty
c.logger.Infof("Recreating master pod '%s'", util.NameFromMeta(masterPod.ObjectMeta)) c.logger.Infof("Recreating master pod '%s'", util.NameFromMeta(masterPod.ObjectMeta))
@ -150,6 +149,7 @@ func (c *Cluster) recreatePods() error {
if err := c.recreatePod(masterPod); err != nil { if err := c.recreatePod(masterPod); err != nil {
return fmt.Errorf("could not recreate master pod '%s': %v", util.NameFromMeta(masterPod.ObjectMeta), err) return fmt.Errorf("could not recreate master pod '%s': %v", util.NameFromMeta(masterPod.ObjectMeta), err)
} }
}
return nil return nil
} }

3
pkg/util/config/config.go
View File

@ -79,6 +79,9 @@ func NewFromMap(m map[string]string) *Config {
value = structField.Default value = structField.Default
} }
if value == "" {
continue
}
err := processField(value, structField.Field) err := processField(value, structField.Field)
if err != nil { if err != nil {
panic(err) panic(err)