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

Use the correct volum handle format for GCE regional PD. #99169

Merged

Conversation

TeweiLuo
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fix bug in gcd_pd PV translation to make sure migration works for regional disks.

Which issue(s) this PR fixes:

Fixes #85623

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/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 17, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @TeweiLuo!

It looks like this is your first PR to kubernetes/kubernetes 🎉. 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/kubernetes 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
Copy link
Contributor

Hi @TeweiLuo. Thanks for your PR.

I'm waiting for a kubernetes 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-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 17, 2021
@Jiawei0227
Copy link
Contributor

/ok-to-test
/lgtm

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

/sig storage
/triage accepted

@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 17, 2021
@Jiawei0227
Copy link
Contributor

@msau42 can you help to approve this?

@Jiawei0227
Copy link
Contributor

/assign @msau42

@@ -231,7 +231,7 @@ func (g *gcePersistentDiskCSITranslator) TranslateInTreePVToCSI(pv *v1.Persisten
if err != nil {
return nil, fmt.Errorf("failed to get region from zones: %v", err)
}
volID = fmt.Sprintf(volIDZonalFmt, UnspecifiedValue, region, pv.Spec.GCEPersistentDisk.PDName)
volID = fmt.Sprintf(volIDRegionalFmt, UnspecifiedValue, region, pv.Spec.GCEPersistentDisk.PDName)
Copy link
Member

Choose a reason for hiding this comment

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

do we have a unit test for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The only test we have that covers PV translation is

func TestTranslationStability(t *testing.T) {
. Since translation from CSI to in-tree doesn't rely on the volume handle, this bug doesn't affect the test. We could add a PD specific test to cover TranslateInTreePVToCSI().

Copy link
Member

Choose a reason for hiding this comment

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

Yeah I think a unit test to cover this case would be good

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ack - will add a test case.

@TeweiLuo
Copy link
Contributor Author

Update: since RePD migration is hard to test with OSS e2e infra, we'll test internally in GKE and then sync the status there.

@Jiawei0227
Copy link
Contributor

I think what Michelle means is we can add a unit test in https://github.com/kubernetes/kubernetes/blob/e16c6cc3483989899961c623518a1150e9078495/staging/src/k8s.io/csi-translation-lib/plugins/gce_pd_test.go to test if the volID being generated is correct when TranslateInTreePVToCSI

@TeweiLuo TeweiLuo force-pushed the fix-repd-volhandle-translation branch from 2d741a1 to 419ea09 Compare March 8, 2021 20:53
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 8, 2021
@TeweiLuo TeweiLuo force-pushed the fix-repd-volhandle-translation branch from 419ea09 to 068bdcf Compare March 8, 2021 20:55
@Jiawei0227
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 8, 2021
@msau42
Copy link
Member

msau42 commented Mar 8, 2021

/lgtm
/approve

Thanks!

/milestone v1.21

@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 8, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, TeweiLuo

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 8, 2021
@TeweiLuo
Copy link
Contributor Author

TeweiLuo commented Mar 8, 2021

/test pull-kubernetes-node-e2e

@k8s-ci-robot k8s-ci-robot merged commit 1a81b24 into kubernetes:master Mar 9, 2021
k8s-ci-robot added a commit that referenced this pull request Apr 8, 2021
…#99169-upstream-release-1.18

Automated cherry pick of #99169: Use the correct volum handle format for GCE regional PD.
k8s-ci-robot added a commit that referenced this pull request Apr 8, 2021
…#99169-upstream-release-1.19

Automated cherry pick of #99169: Use the correct volum handle format for GCE regional PD.
k8s-ci-robot added a commit that referenced this pull request Apr 8, 2021
…#99169-upstream-release-1.20

Automated cherry pick of #99169: Use the correct volum handle format for GCE regional PD.
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. 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. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CSI Migration GCE PD regional disks probably not working
4 participants