Expose AWS_REGION on the node

default value for the node region

read region from env variable

Author: coolstim

charts/aws-fsx-csi-driver/templates/node-daemonset.yaml

@@ -67,6 +67,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- with .Values.node.region }}
+            - name: AWS_REGION
+              value: {{ . }}
+            {{- end }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet

charts/aws-fsx-csi-driver/values.yaml

@@ -88,6 +88,11 @@ node:
     name: fsx-csi-node-sa
     annotations: {}
   podAnnotations: {}
+  # AWS region to use. If not specified then the region will be looked up via the AWS EC2 metadata
+  # service.
+  # ---
+  # region: us-east-1
+  region:
   tolerateAllTaints: true
   tolerations:
     - operator: Exists

pkg/driver/node.go

@@ -59,22 +59,37 @@ type nodeService struct {
 	csi.UnimplementedNodeServer
 }
 
+// driver/node_service.go   – trimmed to the relevant bits
 func newNodeService(driverOptions *DriverOptions) nodeService {
-	klog.V(5).InfoS("[Debug] Retrieving node info from metadata service")
 	region := os.Getenv("AWS_REGION")
-	metadata, err := cloud.NewMetadataService(cloud.DefaultEC2MetadataClient, cloud.DefaultKubernetesAPIClient, region)
-	if err != nil {
-		panic(err)
+
+	var (
+		metadata cloud.MetadataService
+		err      error
+	)
+
+	if region == "" {
+		klog.V(5).InfoS("[Debug] Retrieving region from metadata service")
+		metadata, err := cloud.NewMetadataService(cloud.DefaultEC2MetadataClient, cloud.DefaultKubernetesAPIClient, region)
+		if err != nil {
+			klog.ErrorS(err, "Could not determine region from any metadata service. The region can be manually supplied via the AWS_REGION environment variable.")
+			panic(err)
+		}
+		region = metadata.GetRegion()
+	} else {
+		klog.InfoS("regionFromEnv Node service", "region", region)
+		metadata, err = cloud.NewMetadataService(cloud.DefaultEC2MetadataClient, cloud.DefaultKubernetesAPIClient, region)
+		if err != nil {
+			panic(err)
+		}
 	}
-	klog.InfoS("regionFromSession Node service", "region", metadata.GetRegion())
 
 	nodeMounter, err := newNodeMounter()
 	if err != nil {
 		panic(err)
 	}
 
 	// Remove taint from node to indicate driver startup success
-	// This is done in the background as a goroutine to allow for driver startup
 	go removeTaintInBackground(cloud.DefaultKubernetesAPIClient, removeNotReadyTaint)
 
 	return nodeService{
@@ -242,12 +257,12 @@ func (d *nodeService) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetC
 	return &csi.NodeGetCapabilitiesResponse{Capabilities: caps}, nil
 }
 
-func (d *nodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
-	klog.V(4).InfoS("NodeGetInfo: called", "args", util.SanitizeRequest(req))
-
-	return &csi.NodeGetInfoResponse{
-		NodeId: d.metadata.GetInstanceID(),
-	}, nil
+func (d *nodeService) NodeGetInfo(ctx context.Context, _ *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+	if id := os.Getenv("CSI_NODE_NAME"); id != "" {
+		return &csi.NodeGetInfoResponse{NodeId: id}, nil
+	}
+	// Fallback – still works anywhere IAM roles are present
+	return &csi.NodeGetInfoResponse{NodeId: d.metadata.GetInstanceID()}, nil
 }
 
 // isMounted checks if target is mounted. It does NOT return an error if target