Skip to content
Snippets Groups Projects
Commit 9680552d authored by Murat Kabilov's avatar Murat Kabilov
Browse files

move on if CRD is failed to create

parent d6393d46
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
}
......
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment