From d8c27a9c94590b5f768441d079114f21665878aa Mon Sep 17 00:00:00 2001
From: ajanikow <12255597+ajanikow@users.noreply.github.com>
Date: Wed, 14 Apr 2021 13:47:53 +0000
Subject: [PATCH] Ensure upgrade flag

---
 pkg/deployment/pod/upgrade.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkg/deployment/pod/upgrade.go b/pkg/deployment/pod/upgrade.go
index 0665ad8e9..3290599da 100644
--- a/pkg/deployment/pod/upgrade.go
+++ b/pkg/deployment/pod/upgrade.go
@@ -48,16 +48,13 @@ func (u autoUpgrade) Volumes(i Input) ([]core.Volume, []core.VolumeMount) {
 }
 
 func (u autoUpgrade) Args(i Input) k8sutil.OptionPairs {
-	if !i.AutoUpgrade {
-		return nil
-	}
-
+	// Always add upgrade flag due to fact it is now only in initContainers
 	if i.Version.CompareTo("3.6.0") >= 0 {
 		switch i.Group {
 		case deploymentApi.ServerGroupCoordinators:
-			return k8sutil.NewOptionPair(k8sutil.OptionPair{"--cluster.upgrade", "online"})
+			return k8sutil.NewOptionPair(k8sutil.OptionPair{Key: "--cluster.upgrade", Value: "online"})
 		}
 	}
 
-	return k8sutil.NewOptionPair(k8sutil.OptionPair{"--database.auto-upgrade", "true"})
+	return k8sutil.NewOptionPair(k8sutil.OptionPair{Key: "--database.auto-upgrade", Value: "true"})
 }