Fix AWS_REGION and AWS_DEFAULT_REGION support for eksctl commands (#6787

)
eksctl-io · Jul 11, 2023 · 274929f · 274929f
1 parent 55d3e7f
commit 274929f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/eks/api.go b/pkg/eks/api.go
@@ -140,6 +140,10 @@ func New(ctx context.Context, spec *api.ProviderConfig, clusterSpec *api.Cluster
 		return nil, err
 	}
 
+	if spec.Region == "" {
+		spec.Region = cfg.Region
+	}
+
 	provider.ServicesV2 = &ServicesV2{
 		config: cfg,
 	}

diff --git a/pkg/eks/apiv2.go b/pkg/eks/apiv2.go
@@ -31,10 +31,9 @@ import (
 func newV2Config(pc *api.ProviderConfig, credentialsCacheFilePath string) (aws.Config, error) {
 	var options []func(options *config.LoadOptions) error
 
-	if pc.Region == "" {
-		pc.Region = api.DefaultRegion
+	if pc.Region != "" {
+		options = append(options, config.WithRegion(pc.Region))
 	}
-	options = append(options, config.WithRegion(pc.Region))
 	clientLogMode := aws.ClientLogMode(1)
 
 	if logger.Level >= api.AWSDebugLevel {