diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index 6212f85e23..6de65198e5 100644 --- a/pkg/cli/admin/upgrade/upgrade.go +++ b/pkg/cli/admin/upgrade/upgrade.go @@ -245,8 +245,11 @@ func (o *Options) Run() error { return nil case o.ToMultiArch: + if cv.Status.Desired.Architecture == configv1.ClusterVersionArchitectureMulti { + return errors.New("the cluster already targets a multi-architecture release") + } if cv.Spec.DesiredUpdate != nil && cv.Spec.DesiredUpdate.Architecture == configv1.ClusterVersionArchitectureMulti { - return fmt.Errorf("info: Update to multi cluster architecture has already been requested") + return errors.New("a multi-architecture release has already been requested") } if err := checkForUpgrade(cv); err != nil {