Skip to content

Cherrypick #381 to 2.1.#446

Merged
k8s-ci-robot merged 1 commit intokubernetes-csi:release-2.1from
mattcary:nil-fix
Dec 11, 2020
Merged

Cherrypick #381 to 2.1.#446
k8s-ci-robot merged 1 commit intokubernetes-csi:release-2.1from
mattcary:nil-fix

Conversation

@mattcary
Copy link
Copy Markdown
Contributor

@mattcary mattcary commented Dec 10, 2020 •
edited
Loading

/kind bug

I've tested this manually on a cluster to confirm it fixes the crashlooping, as described in #445.

Which issue(s) this PR fixes:
#445

Backports fix #381 for crashloop when there are errors in the VolumeSnapshot, like a missing VolumeSnapshotClass.

@mattcary
Fix panic when source PVC does not exist
ec44a61 
checkAndUpdateSnapshotClass must always return a snapshot, even though it
fails somewhere in ctrl.SetDefaultSnapshotClass.

Add unit tests for that.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Dec 10, 2020
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 10, 2020
@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Dec 10, 2020

/assign @xing-yang

@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Dec 10, 2020

Hmm, I suspect these test failures are due to the v1 CRDs used on the test cluster. The k8s version would have to be pinned to 1.19 or other heroics done to get the v1beta1 CRDs required by this controller to be used.

@xing-yang do you have any ideas?

@xing-yang
Copy link
Copy Markdown
Collaborator

xing-yang commented Dec 10, 2020

Can you reference PR #381 in the release note?

@xing-yang
Copy link
Copy Markdown
Collaborator

xing-yang commented Dec 10, 2020

We probably need to fix release-tools in release-2.1 to pass CI. See this PR: #437

@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Dec 10, 2020

We probably need to fix release-tools in release-2.1 to pass CI. See this PR: #437

Ok, I'll look into backporting that too.

@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Dec 10, 2020

Can you reference PR #381 in the release note?

done

@mattcary
Copy link
Copy Markdown
Contributor Author

mattcary commented Dec 11, 2020

/retest

@xing-yang
Copy link
Copy Markdown
Collaborator

xing-yang commented Dec 11, 2020

/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 Dec 11, 2020
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Dec 11, 2020

[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 Dec 11, 2020
@k8s-ci-robot k8s-ci-robot merged commit 6685a1b into kubernetes-csi:release-2.1 Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lpabon lpabon Awaiting requested review from lpabon

@yuxiangqian yuxiangqian Awaiting requested review from yuxiangqian

Assignees

@xing-yang xing-yang

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 Denotes a PR that will be considered when it comes time to generate release notes. 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.

3 participants

@mattcary @xing-yang @k8s-ci-robot