From 772f0ca77188c8904277a0c30f4380af0b3f5462 Mon Sep 17 00:00:00 2001
From: Jan Mussler <janm81@gmail.com>
Date: Fri, 12 Feb 2021 17:36:11 +0100
Subject: [PATCH] Fix volume sync order. (#1340)

---
 pkg/cluster/sync.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
index 5c0f6ce84..0144857b9 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -53,6 +53,11 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
 		return err
 	}
 
+	// sync volume may already transition volumes to gp3, if iops/throughput or type is specified
+	if err = c.syncVolumes(); err != nil {
+		return err
+	}
+
 	if c.OpConfig.EnableEBSGp3Migration {
 		err = c.executeEBSMigration()
 		if nil != err {
@@ -60,10 +65,6 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
 		}
 	}
 
-	if err = c.syncVolumes(); err != nil {
-		return err
-	}
-
 	if err = c.enforceMinResourceLimits(&c.Spec); err != nil {
 		err = fmt.Errorf("could not enforce minimum resource limits: %v", err)
 		return err