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: remove SMBGlobalMapping on Windows node #1846

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: remove SMBGlobalMapping on Windows node during volume unmount

Which issue(s) this PR fixes:

Fixes #1830

Requirements:

Special notes for your reviewer:

Release note:

fix: remove SMBGlobalMapping on Windows node

@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 Apr 18, 2024
@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 requested review from cvvz and gnufied April 18, 2024 14:35
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2024
@andyzhangx andyzhangx force-pushed the remove-smb-mount-win branch from 6348f69 to 40cd250 Compare April 18, 2024 14:37
@andyzhangx
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 18, 2024

@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-2022-hostprocess 40cd250 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
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit ec56cd2 into master Apr 19, 2024
28 of 30 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.30

@andyzhangx
Copy link
Member Author

/cherrypick release-1.29

@andyzhangx
Copy link
Member Author

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1847

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.

@k8s-infra-cherrypick-robot

@andyzhangx: #1846 failed to apply on top of branch "release-1.29":

Applying: fix: remove SMBGlobalMapping on Windows node
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
A	pkg/azurefile/azurefile_options.go
M	pkg/azurefile/nodeserver.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/nodeserver.go
CONFLICT (modify/delete): pkg/azurefile/azurefile_options.go deleted in HEAD and modified in fix: remove SMBGlobalMapping on Windows node. Version fix: remove SMBGlobalMapping on Windows node of pkg/azurefile/azurefile_options.go left in tree.
Auto-merging pkg/azurefile/azurefile.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: remove SMBGlobalMapping on Windows node
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.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: #1846 failed to apply on top of branch "release-1.28":

Applying: fix: remove SMBGlobalMapping on Windows node
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
A	pkg/azurefile/azurefile_options.go
M	pkg/azurefile/nodeserver.go
M	pkg/mounter/safe_mounter_host_process_windows.go
M	pkg/os/smb/smb.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/os/smb/smb.go
Auto-merging pkg/mounter/safe_mounter_host_process_windows.go
CONFLICT (content): Merge conflict in pkg/mounter/safe_mounter_host_process_windows.go
Auto-merging pkg/azurefile/nodeserver.go
CONFLICT (modify/delete): pkg/azurefile/azurefile_options.go deleted in HEAD and modified in fix: remove SMBGlobalMapping on Windows node. Version fix: remove SMBGlobalMapping on Windows node of pkg/azurefile/azurefile_options.go left in tree.
Auto-merging pkg/azurefile/azurefile.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: remove SMBGlobalMapping on Windows node
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

remove smb-globalmount when azure file is unmounted on windows node
3 participants