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

Validate CSI Inline Migration unconditionally #80945

Merged
merged 1 commit into from Aug 6, 2019

Conversation

@tedyu
Copy link
Contributor

commented Aug 3, 2019

What type of PR is this?
/kind bug

What this PR does / why we need it:
As @msau42 pointed out in #80931, we should perform validation unconditionally for downgrading to a version with the feature disabled.

Which issue(s) this PR fixes:
Fixes #80931

Special notes for your reviewer:

Fixes validation of VolumeAttachment API objects created with inline volume sources.

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


@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 3, 2019

cc @msau42

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 3, 2019

/test pull-kubernetes-integration

@tedyu tedyu force-pushed the tedyu:uncond-validate branch from 10fc100 to ce9bc5d Aug 3, 2019

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 5, 2019

@msau42
Can you see if I missed something ?

@ddebroy
Copy link
Member

left a comment

Looks good with one suggestion.

Show resolved Hide resolved pkg/apis/storage/validation/validation.go Outdated

@tedyu tedyu force-pushed the tedyu:uncond-validate branch from ce9bc5d to b425505 Aug 5, 2019

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 5, 2019

@ddebroy
Your comment has been addressed.

@ddebroy

This comment has been minimized.

Copy link
Member

commented Aug 5, 2019

/lgtm

@ddebroy

This comment has been minimized.

Copy link
Member

commented Aug 5, 2019

/assign @msau42 @jsafrane

@davidz627

This comment has been minimized.

Copy link
Contributor

commented Aug 5, 2019

/assign @liggitt

@liggitt

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

one comment about restoring the conditional validation message, then lgtm

this will need to be picked back to 1.15

@tedyu tedyu force-pushed the tedyu:uncond-validate branch from b425505 to 67ee7d8 Aug 6, 2019

@k8s-ci-robot k8s-ci-robot added size/S and removed lgtm size/M labels Aug 6, 2019

@tedyu tedyu force-pushed the tedyu:uncond-validate branch 2 times, most recently from 9f1e277 to a4af5ca Aug 6, 2019

@tedyu tedyu force-pushed the tedyu:uncond-validate branch from a4af5ca to bb77aa7 Aug 6, 2019

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

@liggitt
Your comment has been addressed.

@liggitt

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Aug 6, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, tedyu

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

@liggitt

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

/sig storage
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot merged commit 6049253 into kubernetes:master Aug 6, 2019

23 checks passed

cla/linuxfoundation tedyu authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-csi-serial Skipped.
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-iscsi Skipped.
pull-kubernetes-e2e-gce-iscsi-serial Skipped.
pull-kubernetes-e2e-gce-storage-slow Skipped.
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details

@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Aug 6, 2019

@davidz627

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2019

thanks @tedyu @liggitt !

@liggitt

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

let me know when the 1.15 pick is open and I'll tag that as well

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

I ran the following for master branch of my local repo:

GITHUB_USER=tedyu hack/cherry_pick_pull.sh upstream/release-1.5 80945
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/storage/validation/validation_test.go
CONFLICT (content): Merge conflict in pkg/apis/storage/validation/validation_test.go
Auto-merging pkg/apis/storage/validation/validation.go
CONFLICT (content): Merge conflict in pkg/apis/storage/validation/validation.go
error: Failed to merge in the changes.
Patch failed at 0001 Validate CSI Inline Migration unconditionally
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".

I wonder if the command I used was wrong.

@liggitt

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

you probably want upstream/release-1.15

@tedyu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 6, 2019

Created #81038

k8s-ci-robot added a commit that referenced this pull request Aug 8, 2019

Merge pull request #81038 from tedyu/automated-cherry-pick-of-#80945-…
…upstream-release-1.15

Automated cherry pick of #80945: Validate CSI Inline Migration unconditionally
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.