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

bugfix: use original URL from PV volume attributes if cannot get regionId for network policy check #825

Merged
merged 2 commits into from
Aug 17, 2023
Merged

bugfix: use original URL from PV volume attributes if cannot get regionId for network policy check #825

merged 2 commits into from
Aug 17, 2023

Conversation

AlbeeSo
Copy link
Member

@AlbeeSo AlbeeSo commented Aug 9, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #792

Special notes for your reviewer:

Does this PR introduce a user-facing change?

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

@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 Aug 9, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @AlbeeSo. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 9, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: AlbeeSo
Once this PR has been reviewed and has the lgtm label, please assign xianlubird for approval. For more information see the Kubernetes Code Review Process.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@AlbeeSo AlbeeSo changed the title use original URL if get region ID of node error bugfix: use original URL from PV volume attributes if cannot get regionId for network policy check Aug 9, 2023
mowangdk
mowangdk reviewed Aug 10, 2023
View reviewed changes
pkg/oss/utils.go Outdated
@@ -63,6 +65,15 @@ func GetMetaDataAsync(resource string) string {
}
}

// GetRegionID Get RegionID from Metadata first, then Environment Variables
func GetRegionID() string {
regionID := GetMetaDataAsync(regionTag)
Copy link
Contributor

Choose a reason for hiding this comment

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

Metadata may returns 500 / 403 error code with non empty response body.

huww98
huww98 reviewed Aug 13, 2023
View reviewed changes
pkg/oss/nodeserver.go Outdated
@@ -225,10 +226,14 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
return nil, errors.New("Mount is failed, with create path err: " + err.Error() + mountPath)
}

metaZoneID := GetMetaDataAsync(regionTag)
if strings.Contains(opt.URL, metaZoneID) && !strings.Contains(opt.URL, "internal") && !utils.IsPrivateCloud() {
metaRegionID := GetRegionID()
Copy link
Contributor

Choose a reason for hiding this comment

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

We may get region ID once on initialization, instead of getting it every time on NodePublishVolume. The timeout (2s) may be too short, but it is a waste of time on non-ECS servers.

Or better, we may extract it so that it is independent of any driver, multiple drivers would need region ID.

That said, the bug fix is valid. Refactoring can be done afterward.

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 15, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 17, 2023
@mowangdk
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 Aug 17, 2023
@mowangdk mowangdk merged commit e3de357 into kubernetes-sigs:master Aug 17, 2023
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mowangdk mowangdk mowangdk left review comments

@huww98 huww98 huww98 left review comments

@fredkan fredkan Awaiting requested review from fredkan

@xianlubird xianlubird Awaiting requested review from xianlubird

Assignees

@mowangdk mowangdk

Labels
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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

使用 阿里云 OSS PV/PVC 时 pod 出现错误 /usr/local/bin/ossfs 不存在
4 participants
@AlbeeSo @k8s-ci-robot @mowangdk @huww98