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

Fix Pod Disruption Budget null pointer exception

This commit is contained in:
Murat Kabilov 2017-10-20 11:43:50 +02:00 committed by GitHub
parent a1deae198b
commit 661b141849
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cluster/cluster.go
View File

@ -231,6 +231,12 @@ func (c *Cluster) Create() error {
} }
c.logger.Infof("secrets have been successfully created") c.logger.Infof("secrets have been successfully created")
pdb, err := c.createPodDisruptionBudget()
if err != nil {
return fmt.Errorf("could not create pod disruption budget: %v", err)
}
c.logger.Infof("pod disruption budget %q has been successfully created", util.NameFromMeta(pdb.ObjectMeta))
ss, err = c.createStatefulSet() ss, err = c.createStatefulSet()
if err != nil { if err != nil {
return fmt.Errorf("could not create statefulset: %v", err) return fmt.Errorf("could not create statefulset: %v", err)
@ -261,12 +267,6 @@ func (c *Cluster) Create() error {
} }
} }
pdb, err := c.createPodDisruptionBudget()
if err != nil {
return fmt.Errorf("could not create pod disruption budget: %v", err)
}
c.logger.Infof("pod disruption budget %q has been successfully created", util.NameFromMeta(pdb.ObjectMeta))
err = c.listResources() err = c.listResources()
if err != nil { if err != nil {
c.logger.Errorf("could not list resources: %v", err) c.logger.Errorf("could not list resources: %v", err)

5
pkg/cluster/sync.go
View File

@ -278,6 +278,11 @@ func (c *Cluster) syncVolumes() error {
} }
func (c *Cluster) samePDBWith(pdb *policybeta1.PodDisruptionBudget) (match bool, reason string) { func (c *Cluster) samePDBWith(pdb *policybeta1.PodDisruptionBudget) (match bool, reason string) {
if c.PodDisruptionBudget == nil {
match = false
reason = "pdb does not exist"
return
}
match = reflect.DeepEqual(pdb.Spec, c.PodDisruptionBudget.Spec) match = reflect.DeepEqual(pdb.Spec, c.PodDisruptionBudget.Spec)
if !match { if !match {
reason = "new service spec doesn't match the current one" reason = "new service spec doesn't match the current one"