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

@tedyu tedyu 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.:


@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Aug 3, 2019
@tedyu
Copy link
Contributor Author

tedyu commented Aug 3, 2019

cc @msau42

@tedyu
Copy link
Contributor Author

tedyu commented Aug 3, 2019

/test pull-kubernetes-integration

@tedyu tedyu force-pushed the uncond-validate branch from 10fc100 to ce9bc5d Compare August 3, 2019 15:38
@tedyu
Copy link
Contributor Author

tedyu commented Aug 5, 2019

@msau42
Can you see if I missed something ?

Copy link
Member

@ddebroy ddebroy left a comment

Choose a reason for hiding this comment

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

Looks good with one suggestion.

pkg/apis/storage/validation/validation.go Outdated Show resolved Hide resolved
@tedyu tedyu force-pushed the uncond-validate branch from ce9bc5d to b425505 Compare August 5, 2019 19:07
@tedyu
Copy link
Contributor Author

tedyu commented Aug 5, 2019

@ddebroy
Your comment has been addressed.

@ddebroy
Copy link
Member

ddebroy commented Aug 5, 2019

/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 5, 2019
@ddebroy
Copy link
Member

ddebroy commented Aug 5, 2019

/assign @msau42 @jsafrane

@davidz627
Copy link
Contributor

/assign @liggitt

@liggitt
Copy link
Member

liggitt 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 uncond-validate branch from b425505 to 67ee7d8 Compare August 6, 2019 13:53
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 6, 2019
@tedyu tedyu force-pushed the uncond-validate branch 2 times, most recently from 9f1e277 to a4af5ca Compare August 6, 2019 14:06
@tedyu tedyu force-pushed the uncond-validate branch from a4af5ca to bb77aa7 Compare August 6, 2019 15:33
@tedyu
Copy link
Contributor Author

tedyu commented Aug 6, 2019

@liggitt
Your comment has been addressed.

@liggitt
Copy link
Member

liggitt commented Aug 6, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 6, 2019
@k8s-ci-robot
Copy link
Contributor

[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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2019
@liggitt
Copy link
Member

liggitt commented Aug 6, 2019

/sig storage
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Aug 6, 2019
@k8s-ci-robot k8s-ci-robot merged commit 6049253 into kubernetes:master Aug 6, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Aug 6, 2019
@davidz627
Copy link
Contributor

thanks @tedyu @liggitt !

@liggitt
Copy link
Member

liggitt commented Aug 6, 2019

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

@tedyu
Copy link
Contributor Author

tedyu 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
Copy link
Member

liggitt commented Aug 6, 2019

you probably want upstream/release-1.15

@tedyu
Copy link
Contributor Author

tedyu commented Aug 6, 2019

Created #81038

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 6, 2019
k8s-ci-robot added a commit that referenced this pull request Aug 8, 2019
…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
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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-review API validation for CSI Inline Migration
7 participants