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

fix nil map assignment

This commit is contained in:
Rafia Sabih 2020-12-08 11:23:50 +01:00
parent 48be164b05
commit 71124bbdc7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/tests/test_e2e.py
View File

@ -874,7 +874,7 @@ class EndToEndTestCase(unittest.TestCase):
"downscaler/downtime_replicas": "0", "downscaler/downtime_replicas": "0",
"owned-by": "acid", "owned-by": "acid",
} }
self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync")
self.eventuallyTrue(lambda: k8s.check_statefulset_annotations(cluster_label, annotations), "Annotations missing") self.eventuallyTrue(lambda: k8s.check_statefulset_annotations(cluster_label, annotations), "Annotations missing")
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)

3
pkg/cluster/util.go
View File

@ -274,6 +274,9 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) {
// Returns annotations to be passed to child objects // Returns annotations to be passed to child objects
func (c *Cluster) annotationsSet(annotations map[string]string) map[string]string { func (c *Cluster) annotationsSet(annotations map[string]string) map[string]string {
if annotations == nil {
annotations = make(map[string]string)
}
// allow to inherit certain labels from the 'postgres' object // allow to inherit certain labels from the 'postgres' object
if spec, err := c.GetSpec(); err == nil { if spec, err := c.GetSpec(); err == nil {
for k, v := range spec.ObjectMeta.Annotations { for k, v := range spec.ObjectMeta.Annotations {