Skip to content
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

Jump to bottom

[azclient] Refactor AuthProvider multi-tenant token credential #8596

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[azclient] Refactor AuthProvider multi-tenant token credential #8596

wants to merge 4 commits into from

Conversation

zarvd
Copy link
Contributor

@zarvd zarvd commented Mar 12, 2025

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Refactor the AuthProvider to remove the MultiTenantCredential, as the ComputeCredential 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?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Mar 12, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 12, 2025
@k8s-ci-robot
Copy link
Contributor

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 12, 2025
@zarvd zarvd changed the title Refactor AuthProvider multi-tenant token credential [azclient] Refactor AuthProvider multi-tenant token credential Mar 12, 2025
zarvd
zarvd commented Mar 12, 2025
View reviewed changes
pkg/azclient/auth.go Outdated
credOptions := &azidentity.ClientCertificateCredentialOptions{
ClientOptions: *clientOption,
AdditionallyAllowedTenants: []string{armConfig.NetworkResourceTenantID},
SendCertificateChain: true,
Copy link
Contributor Author

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.

MartinForReal
MartinForReal reviewed Mar 12, 2025
View reviewed changes
zarvd
zarvd commented Mar 12, 2025
View reviewed changes
pkg/azclient/auth.go
}
}

// ClientCertificateCredential is used for client certificate
if computeCredential == nil && len(config.AADClientCertPath) > 0 {
credOptions := &azidentity.ClientCertificateCredentialOptions{
ClientOptions: *clientOption,
SendCertificateChain: true,
Copy link
Contributor Author

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.

@MartinForReal
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 12, 2025
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch 4 times, most recently from 4f47ae5 to 02845dc Compare March 13, 2025 04:50
@MartinForReal
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 13, 2025
@MartinForReal
Copy link
Contributor

/assign @andyzhangx

@zarvd
Copy link
Contributor Author

zarvd commented Mar 13, 2025

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 13, 2025
@zarvd
Copy link
Contributor Author

zarvd commented Mar 13, 2025

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 13, 2025
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch from 02845dc to cbf61b6 Compare March 14, 2025 02:15
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 14, 2025
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch from cbf61b6 to b47944e Compare March 17, 2025 01:34
@MartinForReal
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 17, 2025
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch from b47944e to 07fc156 Compare March 17, 2025 06:30
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 17, 2025
@MartinForReal
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 17, 2025
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch from 07fc156 to 1d55408 Compare March 18, 2025 01:12
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 18, 2025
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

feiskyer
feiskyer approved these changes Mar 18, 2025
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, zarvd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2025
feiskyer
feiskyer reviewed Mar 18, 2025
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add some unit tests?

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 18, 2025
@zarvd
Copy link
Contributor Author

zarvd commented Mar 18, 2025

Could you add some unit tests?

Broke down the large NewAuthProvider function into smaller ones and added unit tests for each.

@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch 2 times, most recently from 20c5ae2 to ad77adc Compare March 19, 2025 01:31
@zarvd zarvd force-pushed the refactor/azclient/auth-provider-multi-tenant branch from ad77adc to 47b542f Compare March 19, 2025 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer approved these changes

@MartinForReal MartinForReal MartinForReal left review comments

@mainred mainred Awaiting requested review from mainred

Assignees

@andyzhangx andyzhangx

@MartinForReal MartinForReal

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zarvd @k8s-ci-robot @MartinForReal @feiskyer @andyzhangx