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

init empty map

This commit is contained in:
Felix Kunde 2021-02-05 15:01:17 +01:00
parent 9e2cea54ab
commit fffeef874e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cluster/cluster_test.go
View File

@ -24,6 +24,7 @@ const (
var logger = logrus.New().WithField("test", "cluster") var logger = logrus.New().WithField("test", "cluster")
var eventRecorder = record.NewFakeRecorder(1) var eventRecorder = record.NewFakeRecorder(1)
var teamMap = make(pgteams.PostgresTeamMap, 0)
var cl = New( var cl = New(
Config{ Config{
@ -38,7 +39,7 @@ var cl = New(
DownscalerAnnotations: []string{"downscaler/*"}, DownscalerAnnotations: []string{"downscaler/*"},
}, },
}, },
PgTeamMap: new(pgteams.PostgresTeamMap), PgTeamMap: &teamMap,
}, },
k8sutil.NewMockKubernetesClient(), k8sutil.NewMockKubernetesClient(),
acidv1.Postgresql{ObjectMeta: metav1.ObjectMeta{Name: "acid-test", Namespace: "test", Annotations: map[string]string{"downscaler/downtime_replicas": "0"}}}, acidv1.Postgresql{ObjectMeta: metav1.ObjectMeta{Name: "acid-test", Namespace: "test", Annotations: map[string]string{"downscaler/downtime_replicas": "0"}}},

3
pkg/controller/controller.go
View File

@ -332,7 +332,8 @@ func (c *Controller) initController() {
if c.opConfig.EnablePostgresTeamCRD { if c.opConfig.EnablePostgresTeamCRD {
c.loadPostgresTeams() c.loadPostgresTeams()
} else { } else {
c.pgTeamMap = new(teams.PostgresTeamMap) teamMap := make(teams.PostgresTeamMap, 0)
c.pgTeamMap = &teamMap
} }
if c.opConfig.DebugLogging { if c.opConfig.DebugLogging {

3
pkg/controller/util.go
View File

@ -396,7 +396,8 @@ func (c *Controller) getInfrastructureRole(
func (c *Controller) loadPostgresTeams() { func (c *Controller) loadPostgresTeams() {
// reset team map // 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{}) pgTeams, err := c.KubeClient.PostgresTeamsGetter.PostgresTeams(c.opConfig.WatchedNamespace).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {