From ed6e028b2170d575f31ae68c6469b5e22a564b33 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Fri, 21 Dec 2018 16:51:23 +0100 Subject: [PATCH] Rename the option --- docs/reference/operator_parameters.md | 2 +- manifests/configmap.yaml | 1 + pkg/cluster/cluster.go | 2 +- pkg/util/config/config.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 1ed7504ef..f9a19fccd 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -365,7 +365,7 @@ key. role name to grant to team members created from the Teams API. The default is `admin`, that role is created by Spilo as a `NOLOGIN` role. -* **add_admin_flag_to_robot_roles** +* **enable_admin_role_for_users** if `true`, the `team_admin_role` will have the rights to grant roles coming from PG manifests. Such roles will be created as in "CREATE ROLE 'role_from_manifest' ... ADMIN 'team_admin_role'". The default is `true`. * **pam_role_name** diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index d127e72f2..be72ce2c5 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -19,6 +19,7 @@ data: # postgres_superuser_teams: "postgres_superusers" # enable_team_superuser: "false" # team_admin_role: "admin" + # enable_admin_role_for_users: "true" # teams_api_url: http://fake-teams-api.default.svc.cluster.local # team_api_role_configuration: "log_statement:all" # infrastructure_roles_secret_name: postgresql-infrastructure-roles diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 861b64c98..7eaa873fd 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -710,7 +710,7 @@ func (c *Cluster) initRobotUsers() error { return fmt.Errorf("invalid flags for user %q: %v", username, err) } adminRole := "" - if c.OpConfig.AddAdminFlagToRobotRoles { + if c.OpConfig.EnableAdminRoleForUsers { adminRole = c.OpConfig.TeamAdminRole } newRole := spec.PgUser{ diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 4249c5a8e..cf0f9140b 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -89,7 +89,7 @@ type Config struct { EnableTeamsAPI bool `name:"enable_teams_api" default:"true"` EnableTeamSuperuser bool `name:"enable_team_superuser" default:"false"` TeamAdminRole string `name:"team_admin_role" default:"admin"` - AddAdminFlagToRobotRoles bool `name:"add_admin_flag_to_robot_roles" default:"true"` + EnableAdminRoleForUsers bool `name:"enable_admin_role_for_users" default:"true"` EnableMasterLoadBalancer bool `name:"enable_master_load_balancer" default:"true"` EnableReplicaLoadBalancer bool `name:"enable_replica_load_balancer" default:"false"` // deprecated and kept for backward compatibility