From 429521d733cf02ebf353990080c7d06d87d84dee Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 23 Apr 2019 21:44:17 -0400 Subject: [PATCH] Upgrading with --force should set the force boolean --- pkg/oc/cli/admin/upgrade/upgrade.go | 6 +++--- test/e2e/upgrade/upgrade.go | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/oc/cli/admin/upgrade/upgrade.go b/pkg/oc/cli/admin/upgrade/upgrade.go index fc54514f3b7e..7ecc2c65d9dc 100644 --- a/pkg/oc/cli/admin/upgrade/upgrade.go +++ b/pkg/oc/cli/admin/upgrade/upgrade.go @@ -58,8 +58,6 @@ func New(f kcmdutil.Factory, parentName string, streams genericclioptions.IOStre rolling back to a previous micro version (4.0.2 -> 4.0.1) may be safe, upgrading more than one minor version ahead (4.0 -> 4.2) or downgrading one minor version (4.1 -> 4.0) is likely to cause data corruption or to completely break a cluster. - - Experimental: This command is under active development and may change without notice. `), Run: func(cmd *cobra.Command, args []string) { kcmdutil.CheckErr(o.Complete(f, cmd, args)) @@ -218,7 +216,9 @@ func (o *Options) Run() error { } } - if !o.Force { + if o.Force { + update.Force = true + } else { if err := checkForUpgrade(cv); err != nil { return err } diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go index 10c84a31dd02..61bdfb7fe33f 100644 --- a/test/e2e/upgrade/upgrade.go +++ b/test/e2e/upgrade/upgrade.go @@ -317,6 +317,7 @@ func clusterUpgrade(c configv1client.Interface, version upgrades.VersionContext) desired := configv1.Update{ Version: version.Version.String(), Image: version.NodeImage, + Force: true, } cv.Spec.DesiredUpdate = &desired updated, err := c.ConfigV1().ClusterVersions().Update(cv) @@ -347,7 +348,7 @@ func clusterUpgrade(c configv1client.Interface, version upgrades.VersionContext) framework.Logf("Cluster version operator acknowledged upgrade request") - if err := wait.PollImmediate(5*time.Second, 45*time.Minute, func() (bool, error) { + if err := wait.PollImmediate(5*time.Second, 75*time.Minute, func() (bool, error) { cv, err := c.ConfigV1().ClusterVersions().Get("version", metav1.GetOptions{}) if err != nil { framework.Logf("unable to retrieve cluster version during upgrade: %v", err)