Skip to content

CNTRLPLANE-2205: feat(aws): enable shared role in e2e #7400

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
Dec 17, 2025
Merged

CNTRLPLANE-2205: feat(aws): enable shared role in e2e #7400

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
5 changes: 5 additions & 0 deletions test/e2e/control_plane_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ func TestUpgradeControlPlane(t *testing.T) {
clusterOpts.ReleaseImage = globalOpts.PreviousReleaseImage
clusterOpts.ControlPlaneAvailabilityPolicy = string(hyperv1.HighlyAvailable)

if globalOpts.Platform == hyperv1.AWSPlatform {
// Use this test to verify that individual roles work as expected
clusterOpts.AWSPlatform.SharedRole = false
}

e2eutil.NewHypershiftTest(t, ctx, func(t *testing.T, g Gomega, mgtClient crclient.Client, hostedCluster *hyperv1.HostedCluster) {
// Sanity check the cluster by waiting for the nodes to report ready
guestClient := e2eutil.WaitForGuestClient(t, ctx, mgtClient, hostedCluster)
Expand Down
8 changes: 8 additions & 0 deletions test/e2e/util/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,19 @@ func (o *Options) DefaultAWSOptions() hypershiftaws.RawCreateOptions {
MultiArch: o.ConfigurableClusterOptions.AWSMultiArch,
PublicOnly: true,
UseROSAManagedPolicies: true,
SharedRole: true,
}

if IsLessThan(semver.MustParse("4.16.0")) {
opts.PublicOnly = false
}

// HCCO requires this fix https://github.com/openshift/hypershift/pull/7383
// in order for shared roles to work properly.
if IsLessThan(semver.MustParse("4.20.0")) {
opts.SharedRole = false
}

// Set an expiration date tag if it's not already set
expirationDateTagSet := false
for _, tag := range o.AdditionalTags {
Expand Down