public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-11 16:36:11 +02:00
Code Issues Projects Releases Wiki Activity

introduce cluster interface;

Browse Source 
remove cluster types separate file
This commit is contained in:
Murat Kabilov
2017-06-09 16:02:29 +02:00
parent a6c1e8f64d
commit 685e0c533e
4 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+2 -2
View File
@@ -31,7 +31,7 @@ type Controller struct {
logger *logrus.Entry
clustersMu sync.RWMutex
clusters map[spec.NamespacedName]*cluster.Cluster
clusters map[spec.NamespacedName]cluster.Interface
stopChs map[spec.NamespacedName]chan struct{}
postgresqlInformer cache.SharedIndexInformer
@@ -56,7 +56,7 @@ func New(controllerConfig *Config, operatorConfig *config.Config) *Controller {
Config: *controllerConfig,
opConfig: operatorConfig,
logger: logger.WithField("pkg", "controller"),
clusters: make(map[spec.NamespacedName]*cluster.Cluster),
clusters: make(map[spec.NamespacedName]cluster.Interface),
stopChs: make(map[spec.NamespacedName]chan struct{}),
podCh: make(chan spec.PodEvent),
}
pkg/controller/postgresql.go
+11 -8
View File
@@ -134,8 +134,9 @@ func (c *Controller) processEvent(obj interface{}) error {
c.clustersMu.Unlock()
if err := cl.Create(); err != nil {
cl.Error = fmt.Errorf("could not create cluster: %v", err)
logger.Errorf("%v", cl.Error)
err = fmt.Errorf("could not create cluster: %v", err)
logger.Errorf("%v", err)
cl.SetFailed(err)
return nil
}
@@ -149,12 +150,13 @@ func (c *Controller) processEvent(obj interface{}) error {
return nil
}
if err := cl.Update(event.NewSpec); err != nil {
cl.Error = fmt.Errorf("could not update cluster: %s", err)
logger.Errorf("%v", cl.Error)
err = fmt.Errorf("could not update cluster: %s", err)
logger.Errorf("%v", err)
cl.SetFailed(err)
return nil
}
cl.Error = nil
cl.SetFailed(nil)
logger.Infof("Cluster '%s' has been updated", clusterName)
case spec.EventDelete:
logger.Infof("Deletion of the '%s' cluster started", clusterName)
@@ -191,11 +193,12 @@ func (c *Controller) processEvent(obj interface{}) error {
}
if err := cl.Sync(); err != nil {
cl.Error = fmt.Errorf("could not sync cluster '%s': %v", clusterName, err)
logger.Errorf("%v", cl.Error)
err = fmt.Errorf("could not sync cluster '%s': %v", clusterName, err)
logger.Errorf("%v", err)
cl.SetFailed(err)
return nil
}
cl.Error = nil
cl.SetFailed(nil)
logger.Infof("Cluster '%s' has been synced", clusterName)
}