Skip to content

Cherrypicks to prepare for 2.1.5#488

Merged
k8s-ci-robot merged 3 commits intokubernetes-csi:release-2.1from
mattcary:cherrypick-2.1.5
Mar 30, 2021
Merged

Cherrypicks to prepare for 2.1.5#488
k8s-ci-robot merged 3 commits intokubernetes-csi:release-2.1from
mattcary:cherrypick-2.1.5

Conversation

@mattcary
Copy link
Copy Markdown
Contributor

@mattcary mattcary commented Mar 26, 2021 •
edited
Loading

/kind bug

What this PR does / why we need it:
Cherry-pick #478, and #413 in preparation for 2.1.5 release.

None

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 26, 2021
@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Mar 26, 2021

/assign @saikat-royc

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 26, 2021
@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Mar 26, 2021

/hold

They didn't apply as cleanly as I thought it did.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 26, 2021
@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Mar 26, 2021

/hold cancel

The csi-lib-utils merge was indeed a bridge too far.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2021
@saikat-royc
Copy link
Copy Markdown
Contributor

saikat-royc commented Mar 30, 2021

/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 30, 2021
xing-yang
xing-yang reviewed Mar 30, 2021
View reviewed changes
CHANGELOG-2.1.md Outdated
### Bug or Regression

- Cherry pick of #413: Bug fix to allow creation of snapshot content if pvc finalizer exists, even if pvc is marked for deletion.
- Cherry pick of #478: Call dynamic VS content creation unconditionally.
Copy link
Copy Markdown
Collaborator

@xing-yang xing-yang Mar 30, 2021

Choose a reason for hiding this comment

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

Did you cherry pick #478 in this PR? I don't see it.

Copy link
Copy Markdown
Contributor

@saikat-royc saikat-royc Mar 30, 2021

Choose a reason for hiding this comment

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

the wording is a bit confusing. But #478 itself is the actual cherrypick to release-1.2

Copy link
Copy Markdown
Collaborator

@xing-yang xing-yang Mar 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Can you reword these two lines following this changelog so that it includes PR info for both the original PR and the cherry-pick PR?
https://github.com/kubernetes-csi/external-snapshotter/blob/v3.0.3/CHANGELOG/CHANGELOG-3.0.md#bug-or-regression

Copy link
Copy Markdown
Contributor Author

@mattcary mattcary Mar 30, 2021

Choose a reason for hiding this comment

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

Sorry for the confusion, done.

Note that #413 is cherrypicked in this PR (#488), I hope that's ok.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 30, 2021
@xing-yang
Copy link
Copy Markdown
Collaborator

xing-yang commented Mar 30, 2021

/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 30, 2021
@xing-yang
Copy link
Copy Markdown
Collaborator

xing-yang commented Mar 30, 2021

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 30, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary, xing-yang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 30, 2021
@k8s-ci-robot k8s-ci-robot merged commit 4481886 into kubernetes-csi:release-2.1 Mar 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xing-yang xing-yang xing-yang left review comments

@yuxiangqian yuxiangqian Awaiting requested review from yuxiangqian

+1 more reviewer

@saikat-royc saikat-royc saikat-royc left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@xing-yang xing-yang

@saikat-royc saikat-royc

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. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mattcary @saikat-royc @xing-yang @k8s-ci-robot @RaunakShah