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

Improvements per review

This commit is contained in:
erthalion 2018-09-14 15:23:01 +02:00
parent 903902933f
commit 43a0449c8f
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cluster/actions.go
View File

@ -9,6 +9,8 @@ import (
var NoActions []Action = []Action{} var NoActions []Action = []Action{}
type Plan = []Action
type MetaData struct { type MetaData struct {
cluster *Cluster cluster *Cluster
namespace string namespace string
@ -90,7 +92,8 @@ func (action UpdateSecret) Apply() error {
user := cluster.getSecretUser(action.secretUsername) user := cluster.getSecretUser(action.secretUsername)
// if this secret belongs to the infrastructure role and the password has // if this secret belongs to the infrastructure role and the password has
// changed - replace it in the secret // changed, we need to replace it in the secret. Otherwise synchronize the
// information what we've got in the memory with the data from the secret
updateSecret := (user.Password != string(action.secret.Data["password"]) && updateSecret := (user.Password != string(action.secret.Data["password"]) &&
user.Origin == spec.RoleOriginInfrastructure) user.Origin == spec.RoleOriginInfrastructure)
@ -107,8 +110,8 @@ func (action UpdateSecret) Apply() error {
return fmt.Errorf(msg, action.secretUsername, err) return fmt.Errorf(msg, action.secretUsername, err)
} }
} else { } else {
// for non-infrastructure role - update the role with the password from // for non-infrastructure role - sync the in-memory data. For that we
// the secret // need to update password for the role with the value from the secret
user.Password = string(action.secret.Data["password"]) user.Password = string(action.secret.Data["password"])
cluster.setSecretUser(action.secretUsername, user) cluster.setSecretUser(action.secretUsername, user)
} }

4
pkg/cluster/cluster.go
View File

@ -200,7 +200,7 @@ func (c *Cluster) initUsers() error {
return nil return nil
} }
func (c *Cluster) PlanForCreate() (plan []Action) { func (c *Cluster) PlanForCreate() (plan Plan) {
if err := c.initUsers(); err != nil { if err := c.initUsers(); err != nil {
c.logger.Errorf("Cannot init users: %v", err) c.logger.Errorf("Cannot init users: %v", err)
return NoActions return NoActions
@ -211,7 +211,7 @@ func (c *Cluster) PlanForCreate() (plan []Action) {
} }
// TODO: mind the secrets of the deleted/new users // TODO: mind the secrets of the deleted/new users
func (c *Cluster) PlanForSecrets() (plan []Action) { func (c *Cluster) PlanForSecrets() (plan Plan) {
var msg string var msg string
secrets := c.generateUserSecrets() secrets := c.generateUserSecrets()

12
pkg/controller/postgresql.go
View File

@ -167,12 +167,12 @@ func getClusterName(event ClusterEvent) spec.NamespacedName {
if hasNewName { if hasNewName {
return util.NameFromMeta(event.NewSpec.ObjectMeta) return util.NameFromMeta(event.NewSpec.ObjectMeta)
} else {
return util.NameFromMeta(event.OldSpec.ObjectMeta)
}
} }
func (c *Controller) generatePlan(event ClusterEvent) []cluster.Action { return util.NameFromMeta(event.OldSpec.ObjectMeta)
}
func (c *Controller) generatePlan(event ClusterEvent) cluster.Plan {
var clusterName spec.NamespacedName var clusterName spec.NamespacedName
log := c.logger.WithField("worker", event.WorkerID) log := c.logger.WithField("worker", event.WorkerID)
@ -191,7 +191,7 @@ func (c *Controller) generatePlan(event ClusterEvent) []cluster.Action {
} }
} }
func (c *Controller) validatePlan(plan []cluster.Action) (err error) { func (c *Controller) validatePlan(plan cluster.Plan) (err error) {
for _, action := range plan { for _, action := range plan {
err = action.Validate() err = action.Validate()
@ -203,7 +203,7 @@ func (c *Controller) validatePlan(plan []cluster.Action) (err error) {
return nil return nil
} }
func (c *Controller) applyPlan(plan []cluster.Action) (err error) { func (c *Controller) applyPlan(plan cluster.Plan) (err error) {
for _, action := range plan { for _, action := range plan {
err = action.Apply() err = action.Apply()