Skip to content

release 2.2 backport#641

Merged
k8s-ci-robot merged 4 commits intokubernetes-csi:release-2.2from
pohly:release-2.2-backport
Jun 9, 2021
Merged

release 2.2 backport#641
k8s-ci-robot merged 4 commits intokubernetes-csi:release-2.2from
pohly:release-2.2-backport

Conversation

@pohly
Copy link
Copy Markdown
Contributor

@pohly pohly commented Jun 8, 2021 •
edited
Loading

What type of PR is this?
/kind bug

What this PR does / why we need it:

We should do a v2.2.2 with fixes that have accumulated on the master branch.

Special notes for your reviewer:

One of the backported commits (571be5a) is still pending in #640. While not strictly a bug fix, it addresses a test flake that also could occur on the release branch and thus worth backporting.

Does this PR introduce a user-facing change?:

- Fix env name from POD_NAMESPACE to NAMESPACE for capacity-ownerref-level option. https://github.com/kubernetes-csi/external-provisioner/pull/636, @bells17
- Fix a bug that not being able to use block device mode when enable a storage capacity tracking mode. https://github.com/kubernetes-csi/external-provisioner/pull/635, @bells17

bells17 and others added 4 commits June 8, 2021 11:03
@bells17 @pohly
Fix env name for capacity-ownerref-level option
f86f02d 
(cherry picked from commit b5186db)
@bells17 @pohly
Add SupportsBlock method to provisionWrapper for being able to use bl…
fa70364 
…ock device

(cherry picked from commit a4d465e)
@bells17 @pohly
Add ShouldProvision method to provisionWrapper
69fc839 
(cherry picked from commit 864aac2)
@pohly
capacity test: create CSIStorageObject before instantiating client-set
3d1de7e 
This is necessary to ensure that the controller sees all of the
objects when it starts.

The previous approach with Create() was used to ensure that namespace
and UID are set. We now have to take care of that manually.

(cherry picked from commit 571be5a)
@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 Jun 8, 2021
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 8, 2021
@xing-yang
Copy link
Copy Markdown
Contributor

xing-yang commented Jun 8, 2021 •
edited
Loading

/hold
I'm not sure that this can be backported as it is a feature. Maybe we need to cut a new minor release.
Need more discussion.

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

pohly commented Jun 9, 2021

I'm not sure that this can be backported as it is a feature. Maybe we need to cut a new minor release.

Which of the commits is a feature?

All of the original PRs are bug fixes, either for the sidecar or its tests.

@xing-yang
Copy link
Copy Markdown
Contributor

xing-yang commented Jun 9, 2021

I'm not sure that this can be backported as it is a feature. Maybe we need to cut a new minor release.

Which of the commits is a feature?
All of the original PRs are bug fixes, either for the sidecar or its tests.

I thought "use block device mode when enable a storage capacity tracking mode" is a new feature, but it is actually a bug fix.

/hold cancel

@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 Jun 9, 2021
@xing-yang
Copy link
Copy Markdown
Contributor

xing-yang commented Jun 9, 2021

/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 Jun 9, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jun 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pohly, 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 Jun 9, 2021
@k8s-ci-robot k8s-ci-robot merged commit 996674a into kubernetes-csi:release-2.2 Jun 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggriffiths ggriffiths Awaiting requested review from ggriffiths

@gnufied gnufied Awaiting requested review from gnufied

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.

4 participants

@pohly @xing-yang @k8s-ci-robot @bells17