Skip to content

Commit c588551

Browse files
committed
fix
1 parent 345de75 commit c588551

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/blob/blob.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const (
162162

163163
DefaultTokenAudience = "api://AzureADTokenExchange" //nolint:gosec // G101 ignore this!
164164

165-
defaultAzureFederatedTokenDir = "/var/lib/kubelet/" + DefaultDriverName
165+
defaultAzureFederatedTokenDir = "/var/lib/kubelet/plugins/" + DefaultDriverName
166166
)
167167

168168
var (
@@ -590,15 +590,15 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
590590
}
591591
azureFederatedTokenFile := filepath.Join(defaultAzureFederatedTokenDir, clientID)
592592
klog.V(2).Infof("write workload identity token to %s", azureFederatedTokenFile)
593-
if err := os.WriteFile(azureFederatedTokenFile, []byte(workloadIdentityToken), 0644); err != nil {
593+
if err := os.WriteFile(azureFederatedTokenFile, []byte(workloadIdentityToken), 0600); err != nil {
594594
return rgName, accountName, accountKey, containerName, authEnv, fmt.Errorf("failed to write azure federated token file %s: %v", azureFederatedTokenFile, err)
595595
}
596596

597597
authEnv = append(authEnv, "AZURE_STORAGE_SPN_CLIENT_ID="+clientID)
598598
if tenantID != "" {
599599
authEnv = append(authEnv, "AZURE_STORAGE_SPN_TENANT_ID="+tenantID)
600600
}
601-
authEnv = append(authEnv, "AZURE_FEDERATED_TOKEN_FILE="+azureFederatedTokenFile)
601+
authEnv = append(authEnv, "AZURE_OAUTH_TOKEN_FILE="+azureFederatedTokenFile)
602602

603603
return rgName, accountName, accountKey, containerName, authEnv, err
604604
}

pkg/blob/nodeserver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestNodePublishVolume(t *testing.T) {
244244
d.cloud.ResourceGroup = "rg"
245245
d.enableBlobMockMount = true
246246
// Create the directory for token file
247-
_ = makeDir("/var/lib/kubelet/blob.csi.azure.com/")
247+
_ = makeDir("/var/lib/kubelet/plugins/blob.csi.azure.com/")
248248
},
249249
req: &csi.NodePublishVolumeRequest{
250250
VolumeCapability: &csi.VolumeCapability{AccessMode: &volumeCap},

0 commit comments

Comments
 (0)