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.

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

fix: match account if PrivateEndpoint is not set in storage class #1429

Merged
merged 2 commits into from
Sep 7, 2023

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Sep 6, 2023

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: match account if PrivateEndpoint is not set in storage class

if networkEndpointType setting is not set in storage class, the driver would match the storage account no matter it has private endpoint setting or not.

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. labels Sep 6, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 6, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 6, 2023
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 7, 2023
@andyzhangx andyzhangx changed the title [WIP] fix: match account if PrivateEndpoint is not set in storage class fix: match account if PrivateEndpoint is not set in storage class Sep 7, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 7, 2023
@andyzhangx
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Sep 7, 2023

@andyzhangx: The following test 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-windows-2019 870e7bd link true /test pull-azurefile-csi-driver-e2e-capz-windows-2019

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 e92bfcb into master Sep 7, 2023
16 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

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

Applying: fix: match account if PrivateEndpoint is not set in storage class
Applying: chore: update azure cloud provider lib
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/consts/consts.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_loadbalancer.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_loadbalancer.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/consts/consts.go
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 chore: update azure cloud provider lib
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants