From da523a1c21e0d2f2f9437acff0c8f9e40b3d0db4 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 25 Nov 2021 15:31:06 +0100 Subject: [PATCH] use correct comments --- charts/postgres-operator/values.yaml | 2 +- docs/reference/operator_parameters.md | 4 ++-- pkg/cluster/majorversionupgrade.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index 7b7f1f675..65619845a 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -64,7 +64,7 @@ configUsers: 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 + # upgrades will only be carried out for clusters of listed teams when mode is "off" # major_version_upgrade_team_allow_list: # - acid diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index b0166fa47..00febcf89 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -185,8 +185,8 @@ CRD-configuration, they are grouped under the `major_version_upgrade` key. trigger a rolling update of the pods. The default is `"off"`. * **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. + Upgrades will only be carried out for clusters of listed teams when mode is + set to "off". The default is empty. * **minimal_major_version** The minimal Postgres major version that will not automatically be upgraded diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index 498904034..60048e20d 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -56,7 +56,7 @@ func (c *Cluster) isUpgradeAllowedForTeam(owningTeam string) bool { } /* - Execute upgrade when mode is set to manual or full or when the owning team is allowed for upgrade. + Execute upgrade when mode is set to manual or full or when the owning team is allowed for upgrade (and mode is "off"). 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.