From fffeef874e3f8358dfac3de9c3c926c6325473e5 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 5 Feb 2021 15:01:17 +0100 Subject: [PATCH] init empty map --- pkg/cluster/cluster_test.go | 3 ++- pkg/controller/controller.go | 3 ++- pkg/controller/util.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index 8ef69ddf3..758e614dd 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -24,6 +24,7 @@ const ( var logger = logrus.New().WithField("test", "cluster") var eventRecorder = record.NewFakeRecorder(1) +var teamMap = make(pgteams.PostgresTeamMap, 0) var cl = New( Config{ @@ -38,7 +39,7 @@ var cl = New( DownscalerAnnotations: []string{"downscaler/*"}, }, }, - PgTeamMap: new(pgteams.PostgresTeamMap), + PgTeamMap: &teamMap, }, k8sutil.NewMockKubernetesClient(), acidv1.Postgresql{ObjectMeta: metav1.ObjectMeta{Name: "acid-test", Namespace: "test", Annotations: map[string]string{"downscaler/downtime_replicas": "0"}}}, diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 31c60f23a..7aca23346 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -332,7 +332,8 @@ func (c *Controller) initController() { if c.opConfig.EnablePostgresTeamCRD { c.loadPostgresTeams() } else { - c.pgTeamMap = new(teams.PostgresTeamMap) + teamMap := make(teams.PostgresTeamMap, 0) + c.pgTeamMap = &teamMap } if c.opConfig.DebugLogging { diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 9e7ac5a46..ac0a32e25 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -396,7 +396,8 @@ func (c *Controller) getInfrastructureRole( func (c *Controller) loadPostgresTeams() { // reset team map - c.pgTeamMap = new(teams.PostgresTeamMap) + teamMap := make(teams.PostgresTeamMap, 0) + c.pgTeamMap = &teamMap pgTeams, err := c.KubeClient.PostgresTeamsGetter.PostgresTeams(c.opConfig.WatchedNamespace).List(context.TODO(), metav1.ListOptions{}) if err != nil {