mirror of
https://github.com/zalando/postgres-operator.git
synced 2026-10-04 01:48:32 +02:00
fix nil map assignment
This commit is contained in:
@@ -874,7 +874,7 @@ class EndToEndTestCase(unittest.TestCase):
|
||||
"downscaler/downtime_replicas": "0",
|
||||
"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")
|
||||
|
||||
@timeout_decorator.timeout(TEST_TIMEOUT_SEC)
|
||||
|
||||
@@ -274,6 +274,9 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) {
|
||||
// Returns annotations to be passed to child objects
|
||||
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
|
||||
if spec, err := c.GetSpec(); err == nil {
|
||||
for k, v := range spec.ObjectMeta.Annotations {
|
||||
|
||||
Reference in New Issue
Block a user