[Bugfix] Ensure upgrade flag (#709)

ajanikow · web-flow · commit 9c1565365480 · 2021-04-15T08:43:25.000+02:00
diff --git 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"})
 }

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,13 @@ func (u autoUpgrade) Volumes(i Input) ([]core.Volume, []core.VolumeMount) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (u autoUpgrade) Args(i Input) k8sutil.OptionPairs {`
`51`		`- if !i.AutoUpgrade {`
`52`		`- return nil`
`53`		`- }`
`54`		`-`
	`51`	`+ // Always add upgrade flag due to fact it is now only in initContainers`
`55`	`52`	`if i.Version.CompareTo("3.6.0") >= 0 {`
`56`	`53`	`switch i.Group {`
`57`	`54`	`case deploymentApi.ServerGroupCoordinators:`
`58`		`- return k8sutil.NewOptionPair(k8sutil.OptionPair{"--cluster.upgrade", "online"})`
	`55`	`+ return k8sutil.NewOptionPair(k8sutil.OptionPair{Key: "--cluster.upgrade", Value: "online"})`
`59`	`56`	`}`
`60`	`57`	`}`
`61`	`58`
`62`		`- return k8sutil.NewOptionPair(k8sutil.OptionPair{"--database.auto-upgrade", "true"})`
	`59`	`+ return k8sutil.NewOptionPair(k8sutil.OptionPair{Key: "--database.auto-upgrade", Value: "true"})`
`63`	`60`	`}`