public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

only skip upgrade if failed before after recheck version (#2755)

This commit is contained in:
Ida Novindasari 2024-09-10 10:32:56 +02:00 committed by GitHub
parent 2e398120d2
commit c25dc57b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cluster/majorversionupgrade.go
View File

@ -127,11 +127,6 @@ func (c *Cluster) majorVersionUpgrade() error {
return nil return nil
} }
if _, exists := c.ObjectMeta.Annotations[majorVersionUpgradeFailureAnnotation]; exists {
c.logger.Infof("last major upgrade failed, skipping upgrade")
return nil
}
if !isInMainternanceWindow(c.Spec.MaintenanceWindows) { if !isInMainternanceWindow(c.Spec.MaintenanceWindows) {
c.logger.Infof("skipping major version upgrade, not in maintenance window") c.logger.Infof("skipping major version upgrade, not in maintenance window")
return nil return nil
@ -162,10 +157,19 @@ func (c *Cluster) majorVersionUpgrade() error {
// Recheck version with newest data from Patroni // Recheck version with newest data from Patroni
if c.currentMajorVersion >= desiredVersion { if c.currentMajorVersion >= desiredVersion {
if _, exists := c.ObjectMeta.Annotations[majorVersionUpgradeFailureAnnotation]; exists { // if failure annotation exists, remove it
c.removeFailuresAnnotation()
c.logger.Infof("removing failure annotation as the cluster is already up to date")
}
c.logger.Infof("recheck cluster version is already up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion) c.logger.Infof("recheck cluster version is already up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion)
return nil return nil
} }
if _, exists := c.ObjectMeta.Annotations[majorVersionUpgradeFailureAnnotation]; exists {
c.logger.Infof("last major upgrade failed, skipping upgrade")
return nil
}
isUpgradeSuccess := true isUpgradeSuccess := true
numberOfPods := len(pods) numberOfPods := len(pods)
if allRunning && masterPod != nil { if allRunning && masterPod != nil {