Skip to content
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

NO-JIRA: Only use public IPs for 4.16 and above #5304

Merged
merged 1 commit into from
Dec 17, 2024
Merged

NO-JIRA: Only use public IPs for 4.16 and above #5304

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
Only use public IPs for 4.16 and above 
Currently CAPI is not allowing instances with Public IPs in 4.15 and
earlier. For now, this change only enables public IPs for versions 4.16
and newer.
  • Loading branch information
@csrwng
csrwng committed Dec 16, 2024
commit 0a44e4544a98bd4475073288aa114d95bf092e66
5 changes: 5 additions & 0 deletions test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/blang/semver"
"github.com/go-logr/logr"
"github.com/go-logr/zapr"
hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
Expand Down Expand Up @@ -582,6 +583,10 @@ func (o *options) DefaultAWSOptions() hypershiftaws.RawCreateOptions {
MultiArch: o.configurableClusterOptions.AWSMultiArch,
PublicOnly: true,
}
if e2eutil.IsLessThan(semver.MustParse("4.16.0")) {
opts.PublicOnly = false
}

opts.AdditionalTags = append(opts.AdditionalTags, o.additionalTags...)
if len(o.configurableClusterOptions.Zone) == 0 {
// align with default for e2e.aws-region flag
Expand Down