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

Don't error out at sync on existence of the object. (#26)

This commit is contained in:
Oleksii Kliukin 2017-05-22 12:58:47 +02:00 committed by GitHub
parent 4acaf27a5d
commit 8beb5936b1
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/cluster/sync.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/zalando-incubator/postgres-operator/pkg/util" "github.com/zalando-incubator/postgres-operator/pkg/util"
"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
) )
func (c *Cluster) Sync(stopCh <-chan struct{}) error { func (c *Cluster) Sync(stopCh <-chan struct{}) error {
@ -12,7 +13,7 @@ func (c *Cluster) Sync(stopCh <-chan struct{}) error {
err := c.loadResources() err := c.loadResources()
if err != nil { if err != nil {
c.logger.Errorf("Can't load resources: %s", err) c.logger.Errorf("could not load resources: %v", err)
} }
if !c.podDispatcherRunning { if !c.podDispatcherRunning {
@ -20,35 +21,43 @@ func (c *Cluster) Sync(stopCh <-chan struct{}) error {
c.podDispatcherRunning = true c.podDispatcherRunning = true
} }
c.logger.Debugf("Syncing Secrets") c.logger.Debugf("Syncing secrets")
if err := c.syncSecrets(); err != nil { if err := c.syncSecrets(); err != nil {
return fmt.Errorf("Can't sync Secrets: %s", err) if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync secrets: %v", err)
}
} }
c.logger.Debugf("Syncing Endpoints") c.logger.Debugf("Syncing endpoints")
if err := c.syncEndpoint(); err != nil { if err := c.syncEndpoint(); err != nil {
return fmt.Errorf("Can't sync Endpoints: %s", err) if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync endpoints: %v", err)
}
} }
c.logger.Debugf("Syncing Services") c.logger.Debugf("Syncing services")
if err := c.syncService(); err != nil { if err := c.syncService(); err != nil {
return fmt.Errorf("Can't sync Services: %s", err) if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("coud not sync services: %v", err)
}
} }
c.logger.Debugf("Syncing StatefulSets") c.logger.Debugf("Syncing statefulsets")
if err := c.syncStatefulSet(); err != nil { if err := c.syncStatefulSet(); err != nil {
return fmt.Errorf("Can't sync StatefulSets: %s", err) if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync statefulsets: %v", err)
}
} }
if c.databaseAccessDisabled() { if c.databaseAccessDisabled() {
return nil return nil
} }
if err := c.initDbConn(); err != nil { if err := c.initDbConn(); err != nil {
return fmt.Errorf("Can't init db connection: %s", err) return fmt.Errorf("could not init db connection: %v", err)
} else { } else {
c.logger.Debugf("Syncing Roles") c.logger.Debugf("Syncing roles")
if err := c.SyncRoles(); err != nil { if err := c.SyncRoles(); err != nil {
return fmt.Errorf("Can't sync Roles: %s", err) return fmt.Errorf("could not sync roles: %v", err)
} }
} }