Skip to content

fix: allow clientID, tenantID workload identity parameters in storage class #1939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

fix: allow clientID, tenantID workload identity parameters in storage class #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/blob/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ const (
ephemeralField = "csi.storage.k8s.io/ephemeral"
podNamespaceField = "csi.storage.k8s.io/pod.namespace"
serviceAccountTokenField = "csi.storage.k8s.io/serviceAccount.tokens"
clientIDField = "clientID"
tenantIDField = "tenantID"
clientIDField = "clientid"
tenantIDField = "tenantid"
mountOptionsField = "mountoptions"
falseValue = "false"
trueValue = "true"
Expand Down Expand Up @@ -539,9 +539,9 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
if getLatestAccountKey, err = strconv.ParseBool(v); err != nil {
return rgName, accountName, accountKey, containerName, authEnv, fmt.Errorf("invalid %s: %s in volume context", getLatestAccountKeyField, v)
}
case strings.ToLower(clientIDField):
case clientIDField:
clientID = v
case strings.ToLower(tenantIDField):
case tenantIDField:
tenantID = v
case strings.ToLower(serviceAccountTokenField):
serviceAccountToken = v
Expand Down Expand Up @@ -580,7 +580,9 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
}

authEnv = append(authEnv, "AZURE_STORAGE_SPN_CLIENT_ID="+clientID)
authEnv = append(authEnv, "AZURE_STORAGE_SPN_TENANT_ID="+tenantID)
if tenantID != "" {
authEnv = append(authEnv, "AZURE_STORAGE_SPN_TENANT_ID="+tenantID)
}
authEnv = append(authEnv, "WORKLOAD_IDENTITY_TOKEN="+workloadIdentityToken)

return rgName, accountName, accountKey, containerName, authEnv, err
Expand Down
2 changes: 2 additions & 0 deletions pkg/blob/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
case storageIdentityClientIDField:
case storageIdentityObjectIDField:
case storageIdentityResourceIDField:
case clientIDField:
case tenantIDField:
case msiEndpointField:
case storageAADEndpointField:
// no op, only used in NodeStageVolume
Expand Down
2 changes: 2 additions & 0 deletions pkg/blob/controllerserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ func TestCreateVolume(t *testing.T) {
mp[mountPermissionsField] = "0750"
mp[storageAuthTypeField] = "msi"
mp[storageIdentityClientIDField] = "msi"
mp[clientIDField] = "clientID"
mp[tenantIDField] = "tenantID"
mp[storageIdentityObjectIDField] = "msi"
mp[storageIdentityResourceIDField] = "msi"
mp[msiEndpointField] = "msi"
Expand Down
Loading