-
Notifications
You must be signed in to change notification settings - Fork 280
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.
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
[azclient] Refactor AuthProvider multi-tenant token credential #8596
base: master
Are you sure you want to change the base?
[azclient] Refactor AuthProvider multi-tenant token credential #8596
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: zarvd The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Hi @zarvd. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
credOptions := &azidentity.ClientCertificateCredentialOptions{ | ||
ClientOptions: *clientOption, | ||
AdditionallyAllowedTenants: []string{armConfig.NetworkResourceTenantID}, | ||
SendCertificateChain: true, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MartinForReal Kindly note that I have also add the missing option here. please take a look, thanks.
MultiTenantCredential: multiTenantCredential, | ||
CloudConfig: clientOption.Cloud, | ||
ComputeCredential: computeCredential, | ||
AdditionalComputeClientOptions: additionalComputeClientOptions, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any reference to this field?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be used in L418 in https://github.com/zarvd/cloud-provider-azure/blob/b24b7a4a34c24199494a18b1859db89584558594/pkg/provider/azure.go#L401-L427.
Compared to the existing one
cloud-provider-azure/pkg/provider/azure.go
Lines 405 to 453 in a2e9ea1
if az.ComputeClientFactory == nil { | |
var cred azcore.TokenCredential | |
if az.AuthProvider.IsMultiTenantModeEnabled() { | |
// It uses Service Principal as the multi-tenant credential. | |
// TODO: refactor `IsMultiTenantModeEnabled` to make it more clear. | |
multiTenantCred := az.AuthProvider.GetMultiTenantIdentity() | |
networkTenantCred := az.AuthProvider.GetNetworkAzIdentity() | |
az.NetworkClientFactory, err = azclient.NewClientFactory(&azclient.ClientFactoryConfig{ | |
SubscriptionID: az.NetworkResourceSubscriptionID, | |
}, &az.ARMClientConfig, clientOps.Cloud, networkTenantCred) | |
if err != nil { | |
return err | |
} | |
cred = multiTenantCred | |
} else { | |
cred = az.AuthProvider.GetAzIdentity() | |
} | |
var opts []func(option *arm.ClientOptions) | |
if az.AzureAuthConfig.AuxiliaryTokenProvider != nil && az.AzureAuthConfig.UseManagedIdentityExtension { | |
klog.InfoS("Using auxiliary token provider for ARM network credential") | |
// Multi-tenant mode with auxiliary token provider. | |
// It uses Managed Identity as the primary credential and auxiliary token provider as the auxiliary credential. | |
opts = append(opts, func(option *arm.ClientOptions) { | |
option.PerRetryPolicies = append(option.PerRetryPolicies, armauth.NewAuxiliaryAuthPolicy( | |
[]azcore.TokenCredential{az.AuthProvider.GetNetworkAzIdentity()}, | |
az.AuthProvider.DefaultTokenScope(), | |
)) | |
}) | |
az.NetworkClientFactory, err = azclient.NewClientFactory(&azclient.ClientFactoryConfig{ | |
SubscriptionID: az.NetworkResourceSubscriptionID, | |
}, &az.ARMClientConfig, clientOps.Cloud, az.AuthProvider.GetNetworkAzIdentity()) | |
if err != nil { | |
return err | |
} | |
} | |
az.ComputeClientFactory, err = azclient.NewClientFactory(&azclient.ClientFactoryConfig{ | |
SubscriptionID: az.SubscriptionID, | |
}, &az.ARMClientConfig, clientOps.Cloud, cred, opts...) | |
if err != nil { | |
return err | |
} | |
if az.NetworkClientFactory == nil { | |
az.NetworkClientFactory = az.ComputeClientFactory | |
} | |
} |
} | ||
} | ||
|
||
// ClientCertificateCredential is used for client certificate | ||
if computeCredential == nil && len(config.AADClientCertPath) > 0 { | ||
credOptions := &azidentity.ClientCertificateCredentialOptions{ | ||
ClientOptions: *clientOption, | ||
SendCertificateChain: true, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please take a closer look; it's moved to the else branch in L213.
/ok-to-test |
8235f84
to
878ec67
Compare
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
Refactor the AuthProvider to remove the
MultiTenantCredential
, as theComputeCredential
would work the same and provide the client options while using the auxiliary token provider.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: