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

Report new Postgres CR error when previously incorrect one is being updated (#449)

This commit is contained in:
Maxim Ivanov 2019-01-18 12:36:44 +00:00 committed by Sergey Dudoladov
parent 38f7a3dac6
commit 1109c861fb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/postgresql.go
View File

@ -385,8 +385,14 @@ func (c *Controller) queueClusterEvent(informerOldSpec, informerNewSpec *acidv1.
if informerOldSpec != nil { //update, delete if informerOldSpec != nil { //update, delete
uid = informerOldSpec.GetUID() uid = informerOldSpec.GetUID()
clusterName = util.NameFromMeta(informerOldSpec.ObjectMeta) clusterName = util.NameFromMeta(informerOldSpec.ObjectMeta)
// user is fixing previously incorrect spec
if eventType == EventUpdate && informerNewSpec.Error == "" && informerOldSpec.Error != "" { if eventType == EventUpdate && informerNewSpec.Error == "" && informerOldSpec.Error != "" {
eventType = EventSync eventType = EventSync
}
// set current error to be one of the new spec if present
if informerNewSpec != nil {
clusterError = informerNewSpec.Error clusterError = informerNewSpec.Error
} else { } else {
clusterError = informerOldSpec.Error clusterError = informerOldSpec.Error