Skip to content

Upgrading with --force should set the force boolean #22645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smarterclayton merged 1 commit into from
Apr 25, 2019
Merged

Upgrading with --force should set the force boolean #22645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/oc/cli/admin/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down