@@ -100,8 +100,8 @@ const (
100100 ephemeralField = "csi.storage.k8s.io/ephemeral"
101101 podNamespaceField = "csi.storage.k8s.io/pod.namespace"
102102 serviceAccountTokenField = "csi.storage.k8s.io/serviceAccount.tokens"
103- clientIDField = "clientID "
104- tenantIDField = "tenantID "
103+ clientIDField = "clientid "
104+ tenantIDField = "tenantid "
105105 mountOptionsField = "mountoptions"
106106 falseValue = "false"
107107 trueValue = "true"
@@ -541,9 +541,9 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
541541 if getLatestAccountKey , err = strconv .ParseBool (v ); err != nil {
542542 return rgName , accountName , accountKey , containerName , authEnv , fmt .Errorf ("invalid %s: %s in volume context" , getLatestAccountKeyField , v )
543543 }
544- case strings . ToLower ( clientIDField ) :
544+ case clientIDField :
545545 clientID = v
546- case strings . ToLower ( tenantIDField ) :
546+ case tenantIDField :
547547 tenantID = v
548548 case strings .ToLower (serviceAccountTokenField ):
549549 serviceAccountToken = v
@@ -582,7 +582,9 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
582582 }
583583
584584 authEnv = append (authEnv , "AZURE_STORAGE_SPN_CLIENT_ID=" + clientID )
585- authEnv = append (authEnv , "AZURE_STORAGE_SPN_TENANT_ID=" + tenantID )
585+ if tenantID != "" {
586+ authEnv = append (authEnv , "AZURE_STORAGE_SPN_TENANT_ID=" + tenantID )
587+ }
586588 authEnv = append (authEnv , "WORKLOAD_IDENTITY_TOKEN=" + workloadIdentityToken )
587589
588590 return rgName , accountName , accountKey , containerName , authEnv , err
0 commit comments