Skip to content

Add code for acquiring region from env; Refactor code to reduce EC2 c… #2217

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
merged 3 commits into from
Sep 20, 2021
Merged

Add code for acquiring region from env; Refactor code to reduce EC2 c… #2217

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4d61f3
Add code for acquiring region from env; Refactor code to reduce EC2 c…
Sep 7, 2021
277a1d7
Add code for IMDS call if env unconfigured
Sep 9, 2021
4744674
Revert refactoring of IMDS code
Sep 9, 2021
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: 17 additions & 8 deletions pkg/aws/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"os"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/metrics"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/throttle"
Expand Down Expand Up @@ -44,14 +45,6 @@ type Cloud interface {
func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud, error) {
metadataSess := session.Must(session.NewSession(aws.NewConfig()))
metadata := services.NewEC2Metadata(metadataSess)
if len(cfg.Region) == 0 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not modify this block instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually added the IMDS call inside the if to reduce the number of IMDS calls per instance. So I am making the call only if it is required.

region, err := metadata.Region()
if err != nil {
return nil, errors.Wrap(err, "failed to introspect region from EC2Metadata, specify --aws-region instead if EC2Metadata is unavailable")
}
cfg.Region = region
}

if len(cfg.VpcID) == 0 {
vpcId, err := metadata.VpcID()
if err != nil {
Expand All @@ -60,6 +53,22 @@ func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud,
cfg.VpcID = vpcId
}

if len(cfg.Region) == 0 {
region := os.Getenv("AWS_DEFAULT_REGION")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These env variables are set only if the IRSA is configured. We still need metadata introspection for the region configuration as a fallback.

if region == "" {
region = os.Getenv("AWS_REGION")
}

if region == ""{
err := (error)(nil)
region, err = metadata.Region()
if err != nil {
return nil, errors.Wrap(err, "failed to introspect region from EC2Metadata, specify --aws-region instead if EC2Metadata is unavailable")
}
}
cfg.Region = region
}

awsCFG := aws.NewConfig().WithRegion(cfg.Region).WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint).WithMaxRetries(cfg.MaxRetries)
sess := session.Must(session.NewSession(awsCFG))
injectUserAgent(&sess.Handlers)
Expand Down