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

if cluster was running don't error on sync

This commit is contained in:
Felix Kunde 2019-11-22 14:43:46 +01:00
parent c5dfd11e29
commit 6129593be7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cluster/sync.go
View File

@ -23,6 +23,7 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
oldStatus := c.Status
c.setSpec(newSpec) c.setSpec(newSpec)
defer func() { defer func() {
@ -36,7 +37,12 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
if err = c.validateResources(&c.Spec); err != nil { if err = c.validateResources(&c.Spec); err != nil {
err = fmt.Errorf("insufficient resources specified: %v", err) err = fmt.Errorf("insufficient resources specified: %v", err)
return err if oldStatus.Running() {
c.logger.Warning(err)
err = nil
} else {
return err
}
} }
if err = c.initUsers(); err != nil { if err = c.initUsers(); err != nil {