Skip to content

OCPBUGS-99783: fix(e2e): check pre-upgrade HO version for shared role support #8891

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
openshift-merge-bot merged 1 commit into from
Jul 30, 2026
+25 −0
Merged

OCPBUGS-99783: fix(e2e): check pre-upgrade HO version for shared role support #8891

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
25 changes: 25 additions & 0 deletions test/e2e/upgrade_hypershift_operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ import (
"fmt"
"strings"
"testing"
"time"

"github.com/blang/semver"
"github.com/onsi/gomega"
hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
"github.com/openshift/hypershift/hypershift-operator/controllers/manifests"
"github.com/openshift/hypershift/support/supportedversion"
e2eutil "github.com/openshift/hypershift/test/e2e/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/cluster-api/api/core/v1beta1"
crclient "sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down Expand Up @@ -79,6 +83,27 @@ func TestUpgradeHyperShiftOperator(t *testing.T) {
g.Expect(err).ToNot(gomega.HaveOccurred(), "Getting HyperShiftOperator image shouldn't return errors")
t.Logf("Observed pre-upgrade HyperShift Operator image %q", operatorImage)

// Shared role credential reconciliation only landed on 4.21+.
// Check the pre-upgrade HO's advertised version, not the release image version.
// The supported-versions ConfigMap is reconciled asynchronously by the HO after
// its deployment becomes Available, so poll until the overall test times out.
var preUpgradeHOVersion semver.Version
err = wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(ctx context.Context) (bool, error) {
v, err := supportedversion.GetLatestSupportedOCPVersion(ctx, client)
if err != nil {
t.Logf("Waiting for supported-versions ConfigMap: %v", err)
return false, nil
}
preUpgradeHOVersion = v
return true, nil
})
g.Expect(err).ToNot(gomega.HaveOccurred(), "reading pre-upgrade HO version from supported-versions ConfigMap")
t.Logf("Pre-upgrade HO latest supported version: %s", preUpgradeHOVersion)
if preUpgradeHOVersion.LT(e2eutil.Version421) {
t.Log("Pre-upgrade HO < 4.21, disabling shared role")
clusterOpts.AWSPlatform.SharedRole = false
}

t.Log("Executing upgrade test")
e2eutil.NewHypershiftTest(t, ctx, func(t *testing.T, g gomega.Gomega, mc crclient.Client, hc *hyperv1.HostedCluster) {
t.Logf("HostedCluster %s created", crclient.ObjectKeyFromObject(hc))
Expand Down