Skip to content
New issue

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

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

Already on GitHub? # to your account

fix: ensure azure cloud config could be loaded from secret #1729

Merged
merged 1 commit into from
Feb 29, 2024
Merged

fix: ensure azure cloud config could be loaded from secret #1729

merged 1 commit into from
Feb 29, 2024

Conversation

jlpedrosa
Copy link
Contributor

@jlpedrosa jlpedrosa commented Feb 28, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:
Enables azure-csi to be run with the option to provide a cloud-config in a secret, which is required via the current helm chart for non AKS clusters.

Current implementation is shadowing the variables, so even on successful loading the config from the secret, the configuration is lost (nil) and ignored by the rest of the code.

Requirements:

Special notes for your reviewer:

Release note:

none

Signed-off-by: Jose Luis Pedrosa <jlpedrosa@gmail.com>
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 28, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @jlpedrosa!

It looks like this is your first PR to kubernetes-sigs/azurefile-csi-driver 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/azurefile-csi-driver has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 28, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jlpedrosa. 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 28, 2024
@andyzhangx andyzhangx changed the title Ensure config is used when read correctly fix: ensure config could be loaded from secret Feb 28, 2024
@andyzhangx
Copy link
Member

/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 Feb 28, 2024
@andyzhangx
Copy link
Member

/retest

@jlpedrosa
Copy link
Contributor Author

@andyzhangx: I see the tests are timing out, I do believe it's not related to this particular change. Should I use retest command until it works? I am assuming I'm allowed to do that once you indicated ok to thest?

@andyzhangx
Copy link
Member

@andyzhangx: I see the tests are timing out, I do believe it's not related to this particular change. Should I use retest command until it works? I am assuming I'm allowed to do that once you indicated ok to thest?

@jlpedrosa just ignore this test since there is same failure in another PR, sth. wrong with the test suite to create a new vm.

@andyzhangx
Copy link
Member

/retest

@andyzhangx andyzhangx changed the title fix: ensure config could be loaded from secret fix: ensure azure cloud config could be loaded from secret Feb 29, 2024
Copy link
Member

@andyzhangx andyzhangx 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 k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 29, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, jlpedrosa

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 Feb 29, 2024
@andyzhangx
Copy link
Member

/retest

@k8s-ci-robot
Copy link
Contributor

@jlpedrosa: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azurefile-csi-driver-e2e-capz 4b83fc3 link true /test pull-azurefile-csi-driver-e2e-capz
pull-azurefile-csi-driver-e2e-capz-windows-2022-hostprocess 4b83fc3 link true /test pull-azurefile-csi-driver-e2e-capz-windows-2022-hostprocess

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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/test-infra repository. I understand the commands that are listed here.

@andyzhangx andyzhangx merged commit bc95314 into kubernetes-sigs:master Feb 29, 2024
21 of 24 checks passed
@andyzhangx
Copy link
Member

/cherrypick release-1.30

@andyzhangx
Copy link
Member

/cherrypick release-1.29

@andyzhangx
Copy link
Member

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

@andyzhangx: #1729 failed to apply on top of branch "release-1.28":

Applying: fix: Ensure cloud-config is used when read correctly from configmap
Using index info to reconstruct a base tree...
M	pkg/azurefile/azure.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/azure.go
CONFLICT (content): Merge conflict in pkg/azurefile/azure.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: Ensure cloud-config is used when read correctly from configmap
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.28

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/test-infra repository.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1731

In response to this:

/cherrypick release-1.29

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/test-infra repository.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1732

In response to this:

/cherrypick release-1.30

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/test-infra repository.

@@ -75,7 +75,7 @@ func getCloudProvider(ctx context.Context, kubeconfig, nodeID, secretName, secre

if kubeClient != nil {
klog.V(2).Infof("reading cloud config from secret %s/%s", secretNamespace, secretName)
config, err := configloader.Load[azure.Config](ctx, &configloader.K8sSecretLoaderConfig{
config, err = configloader.Load[azure.Config](ctx, &configloader.K8sSecretLoaderConfig{
Copy link
Member

Choose a reason for hiding this comment

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

do you know whether we have any golint check or sth. else to avoid such issue? @MartinForReal @cvvz

# for free to join this conversation on GitHub. Already have an account? # to comment
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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants