do not use words like whitelisting

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -131,7 +131,7 @@ spec:
                   major_version_upgrade_mode:
                     type: string
                     default: "off"
-                  major_version_upgrade_team_whitelist:
+                  major_version_upgrade_team_allow_list:
                     type: array
                     items:
                       type: string

charts/postgres-operator/values.yaml

@@ -65,7 +65,7 @@ configMajorVersionUpgrade:
   # "off": no upgrade, "manual": manifest triggers action, "full": minimal version violation triggers too
   major_version_upgrade_mode: "off"
   # upgrades will only be carried out for clusters of listed teams
-  # major_version_upgrade_team_whitelist:
+  # major_version_upgrade_team_allow_list:
   # - acid
 
   # minimal Postgres major version that will not automatically be upgraded

docs/reference/operator_parameters.md

@@ -184,7 +184,7 @@ CRD-configuration, they are grouped under the `major_version_upgrade` key.
   Note, that with all three modes increasing the version in the manifest will
   trigger a rolling update of the pods. The default is `"off"`.
 
-* **major_version_upgrade_team_whitelist**
+* **major_version_upgrade_team_allow_list**
   Upgrades will only be carried out for clusters of listed teams. The default
   is empty which means a team filter is not applied.
 

docs/user.md

@@ -603,10 +603,9 @@ spec:
 ```
 
 Some extensions require SUPERUSER rights on creation unless they are not
-whitelisted by the [pgextwlist](https://github.com/dimitri/pgextwlist)
+allowed by the [pgextwlist](https://github.com/dimitri/pgextwlist) extension,
-extension, that is shipped with the Spilo image. To see which extensions are
+that is shipped with the Spilo image. To see which extensions are on the list
-on the list check the `extwlist.extension` parameter in the postgresql.conf
+check the `extwlist.extension` parameter in the postgresql.conf file.
-file.
 
 ```bash
 SHOW extwlist.extensions;

manifests/configmap.yaml

@@ -77,7 +77,7 @@ data:
   logical_backup_s3_sse: "AES256"
   logical_backup_schedule: "30 00 * * *"
   major_version_upgrade_mode: "manual"
-  # major_version_upgrade_team_whitelist: ""
+  # major_version_upgrade_team_allow_list: ""
   master_dns_name_format: "{cluster}.{team}.{hostedzone}"
   # master_pod_move_timeout: 20m
   # max_instances: "-1"

manifests/operatorconfiguration.crd.yaml

@@ -129,7 +129,7 @@ spec:
                   major_version_upgrade_mode:
                     type: string
                     default: "off"
-                  major_version_upgrade_team_whitelist:
+                  major_version_upgrade_team_allow_list:
                     type: array
                     items:
                       type: string

manifests/postgresql-operator-default-configuration.yaml

@@ -28,7 +28,7 @@ configuration:
     super_username: postgres
   major_version_upgrade:
     major_version_upgrade_mode: "off"
-    # major_version_upgrade_team_whitelist:
+    # major_version_upgrade_team_allow_list:
     # - acid
     minimal_major_version: "9.6"
     target_major_version: "14"

pkg/apis/acid.zalan.do/v1/crds.go

@@ -1019,7 +1019,7 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
 							"major_version_upgrade_mode": {
 								Type: "string",
 							},
-							"major_version_upgrade_team_whitelist": {
+							"major_version_upgrade_team_allow_list": {
 								Type: "array",
 								Items: &apiextv1.JSONSchemaPropsOrArray{
 									Schema: &apiextv1.JSONSchemaProps{

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

@@ -44,7 +44,7 @@ type PostgresUsersConfiguration struct {
 // MajorVersionUpgradeConfiguration defines how to execute major version upgrades of Postgres.
 type MajorVersionUpgradeConfiguration struct {
 	MajorVersionUpgradeMode          string   `json:"major_version_upgrade_mode" default:"off"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade
-	MajorVersionUpgradeTeamWhitelist []string `json:"major_version_upgrade_team_whitelist,omitempty"`
+	MajorVersionUpgradeTeamAllowList []string `json:"major_version_upgrade_team_allow_list,omitempty"`
 	MinimalMajorVersion              string   `json:"minimal_major_version" default:"9.6"`
 	TargetMajorVersion               string   `json:"target_major_version" default:"14"`
 }

pkg/cluster/majorversionupgrade.go

@@ -45,25 +45,25 @@ func (c *Cluster) GetDesiredMajorVersion() string {
 	return c.Spec.PgVersion
 }
 
-func (c *Cluster) isTeamWhitelisted(owningTeam string) bool {
+func (c *Cluster) isUpgradeAllowedForTeam(owningTeam string) bool {
-	whitelistedTeams := c.OpConfig.MajorVersionUpgradeTeamWhitelist
+	allowedTeams := c.OpConfig.MajorVersionUpgradeTeamAllowList
 
-	if len(whitelistedTeams) == 0 {
+	if len(allowedTeams) == 0 {
 		return false
 	}
 
-	return util.SliceContains(whitelistedTeams, owningTeam)
+	return util.SliceContains(allowedTeams, owningTeam)
 }
 
 /*
-  Execute upgrade when mode is set to manual or full or when the owning team is whitelisted for upgrade.
+  Execute upgrade when mode is set to manual or full or when the owning team is allowed for upgrade.
 
   Manual upgrade means, it is triggered by the user via manifest version change
   Full upgrade means, operator also determines the minimal version used accross all clusters and upgrades violators.
 */
 func (c *Cluster) majorVersionUpgrade() error {
 
-	if c.OpConfig.MajorVersionUpgradeMode == "off" && !c.isTeamWhitelisted(c.Spec.TeamID) {
+	if c.OpConfig.MajorVersionUpgradeMode == "off" && !c.isUpgradeAllowedForTeam(c.Spec.TeamID) {
 		return nil
 	}
 

pkg/controller/operator_config.go

@@ -56,7 +56,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 
 	// major version upgrade config
 	result.MajorVersionUpgradeMode = util.Coalesce(fromCRD.MajorVersionUpgrade.MajorVersionUpgradeMode, "off")
-	result.MajorVersionUpgradeTeamWhitelist = fromCRD.MajorVersionUpgrade.MajorVersionUpgradeTeamWhitelist
+	result.MajorVersionUpgradeTeamAllowList = fromCRD.MajorVersionUpgrade.MajorVersionUpgradeTeamAllowList
 	result.MinimalMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.MinimalMajorVersion, "9.6")
 	result.TargetMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.TargetMajorVersion, "14")
 

pkg/util/config/config.go

@@ -212,7 +212,7 @@ type Config struct {
 	EnablePgVersionEnvVar                  bool              `name:"enable_pgversion_env_var" default:"true"`
 	EnableSpiloWalPathCompat               bool              `name:"enable_spilo_wal_path_compat" default:"false"`
 	MajorVersionUpgradeMode                string            `name:"major_version_upgrade_mode" default:"off"`
-	MajorVersionUpgradeTeamWhitelist       []string          `name:"major_version_upgrade_team_whitelist" default:""`
+	MajorVersionUpgradeTeamAllowList       []string          `name:"major_version_upgrade_team_allow_list" default:""`
 	MinimalMajorVersion                    string            `name:"minimal_major_version" default:"9.6"`
 	TargetMajorVersion                     string            `name:"target_major_version" default:"14"`
 }