add sts regional endpoint logic

pkg/providers/v1/aws.go

@@ -1209,8 +1209,18 @@ func init() {
  return nil, fmt.Errorf("unable to validate custom endpoint overrides: %v", err)
  }
 
+ metadata, err := newAWSSDKProvider(nil, cfg).Metadata()
+ if err != nil {
+ return nil, fmt.Errorf("error creating AWS metadata client: %q", err)
+ }
+
+ regionName, _, err := getRegionFromMetadata(*cfg, metadata)
+ if err != nil {
+ return nil, err
+ }
+
  sess, err := session.NewSessionWithOptions(session.Options{
- Config: aws.Config{},
+ Config: *aws.NewConfig().WithRegion(regionName).WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint),
  SharedConfigState: session.SharedConfigEnable,
  })
  if err != nil {
@@ -1302,16 +1312,7 @@ func newAWSCloud(cfg CloudConfig, awsServices Services) (*Cloud, error) {
  return nil, fmt.Errorf("error creating AWS metadata client: %q", err)
  }
 
- err = updateConfigZone(&cfg, metadata)
- if err != nil {
- return nil, fmt.Errorf("unable to determine AWS zone from cloud provider config or EC2 instance metadata: %v", err)
- }
-
- zone := cfg.Global.Zone
- if len(zone) <= 1 {
- return nil, fmt.Errorf("invalid AWS zone in config file: %s", zone)
- }
- regionName, err := azToRegion(zone)
+ regionName, zone, err := getRegionFromMetadata(cfg, metadata)
  if err != nil {
  return nil, err
  }
@@ -5130,3 +5131,23 @@ func (c *Cloud) describeNetworkInterfaces(nodeName string) (*ec2.NetworkInterfac
  }
  return eni.NetworkInterfaces[0], nil
 }
+
+func getRegionFromMetadata(cfg CloudConfig, metadata EC2Metadata) (string, string, error) {
+ klog.Infof("Get AWS region from metadata client")
+ err := updateConfigZone(&cfg, metadata)
+ if err != nil {
+ return "", "", fmt.Errorf("unable to determine AWS zone from cloud provider config or EC2 instance metadata: %v", err)
+ }
+
+ zone := cfg.Global.Zone
+ if len(zone) <= 1 {
+ return "", "", fmt.Errorf("invalid AWS zone in config file: %s", zone)
+ }
+
+ regionName, err := azToRegion(zone)
+ if err != nil {
+ return "", "", err
+ }
+
+ return regionName, zone, nil
+}