From 95eb7230694705502835c33d7223954097eb6165 Mon Sep 17 00:00:00 2001 From: savio87 Date: Tue, 4 Aug 2026 12:34:34 +0530 Subject: [PATCH 1/2] OCPBUGS-8247: return error when --to-multi-arch is used on a multi-arch cluster --- pkg/cli/admin/upgrade/upgrade.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index 6212f85e23..c352c069b2 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 fmt.Errorf("Cluster is already multi-architecture") + } 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 fmt.Errorf("Cluster has already been requested to update to multi-architecture") } if err := checkForUpgrade(cv); err != nil { From 1c6c84a0a18230f42abee6a3371e8051d0342a9a Mon Sep 17 00:00:00 2001 From: savio87 Date: Fri, 7 Aug 2026 15:34:35 +0530 Subject: [PATCH 2/2] OCPBUGS-8247: clarify message when cluster is transitioning to multi-arch --- pkg/cli/admin/upgrade/upgrade.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index c352c069b2..572687a853 100644 --- a/pkg/cli/admin/upgrade/upgrade.go +++ b/pkg/cli/admin/upgrade/upgrade.go @@ -246,7 +246,7 @@ func (o *Options) Run() error { case o.ToMultiArch: if cv.Status.Desired.Architecture == configv1.ClusterVersionArchitectureMulti { - return fmt.Errorf("Cluster is already multi-architecture") + return fmt.Errorf("Cluster is already updating to multi-architecture") } if cv.Spec.DesiredUpdate != nil && cv.Spec.DesiredUpdate.Architecture == configv1.ClusterVersionArchitectureMulti { return fmt.Errorf("Cluster has already been requested to update to multi-architecture")