diff --git a/pkg/cluster/pg.go b/pkg/cluster/pg.go index 7f421573f44ea0a65b72135fe2a68d70202d48fe..186489f3322218148310e058e91cf9553d894ab0 100644 --- a/pkg/cluster/pg.go +++ b/pkg/cluster/pg.go @@ -175,19 +175,19 @@ func (c *Cluster) createDatabases() error { for datname, owner := range newDbs { if _, ok := c.pgUsers[owner]; !ok { - c.logger.Infof("skipping creation of the %q database, user %q does not exist", datname, owner) + c.logger.Warningf("skipping creation of the %q database, user %q does not exist", datname, owner) continue } if !databaseNameRegexp.MatchString(datname) { - c.logger.Infof("database %q has invalid name", datname) + c.logger.Warningf("database %q has invalid name", datname) continue } - c.logger.Infof("creating database %q with owner %q", datname, owner) if _, err = c.pgDb.Query(fmt.Sprintf(createDatabaseSQL, datname, owner)); err != nil { return fmt.Errorf("could not query database: %v", err) } + c.logger.Infof("database %q with the owner %q has been created", datname, owner) } return nil diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go index 36c8eb6071865cfc3052f80cc400cf395075cb93..a18651d7479298cdec58b0b0bbd9fd4d1143bd3a 100644 --- a/pkg/cluster/util.go +++ b/pkg/cluster/util.go @@ -174,11 +174,17 @@ func (c *Cluster) getTeamMembers() ([]string, error) { if err != nil { return []string{}, fmt.Errorf("could not get oauth token: %v", err) } + if len(token) == 0 { + return []string{}, fmt.Errorf("could not get oauth token: empty token") + } teamInfo, err := c.teamsAPIClient.TeamInfo(c.Spec.TeamID, token) if err != nil { return nil, fmt.Errorf("could not get team info: %v", err) } + if len(teamInfo.Members) == 0 { + c.logger.Warningf("team API returned empty list of members for the %q team", c.Spec.TeamID) + } return teamInfo.Members, nil } diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 3f847d2248e7bb3e68413b4577dd0d0e06541bdc..da4e9cadd73d6b06699bb98d96fec4a3016fb54d 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -54,7 +54,7 @@ func (c *Controller) createCRD() error { if _, err := c.KubeClient.CustomResourceDefinitions().Create(crd); err != nil { if !k8sutil.ResourceAlreadyExists(err) { - return fmt.Errorf("could not create customResourceDefinition: %v", err) + c.logger.Warningf("could not create customResourceDefinition: %v", err) } c.logger.Infof("customResourceDefinition %q is already registered", crd.Name) } else {