Skip to content

Release 2.2 backport#626

Merged
k8s-ci-robot merged 2 commits intokubernetes-csi:release-2.2from
pohly:release-2.2-backport
May 5, 2021
Merged

Release 2.2 backport#626
k8s-ci-robot merged 2 commits intokubernetes-csi:release-2.2from
pohly:release-2.2-backport

Conversation

@pohly
Copy link
Contributor

@pohly pohly commented May 5, 2021

What type of PR is this?
/kind bug

What this PR does / why we need it:

Two bug fixes that should go into 2.2.1.

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

- gathered metric family process_start_time_seconds has help "[ALPHA] Start time of the process since unix epoch in seconds." but should have "Start time of the process since unix epoch in seconds."
- Fix capacity information updates when topology changes. Only affected central deployment and network attached storage, not deployment on each node. This broke in v2.2.0 as part of a bug fix for capacity informer handling.

jsafrane and others added 2 commits May 5, 2021 20:07
Don't register process_start_time_seconds metric in migration metrics
manager to prevent double registration, resulting in this error:

gathered metric family process_start_time_seconds has help "[ALPHA] Start time of the process since unix epoch in seconds." but should have "Start time of the process since unix epoch in seconds."


(cherry picked from commit b2be509)
@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 May 5, 2021
@k8s-ci-robot k8s-ci-robot requested review from davidz627 and msau42 May 5, 2021 19:02
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 5, 2021
@xing-yang
Copy link
Contributor

Are you backporting to 2.2.1? Why does it say merging into kubernetes-csi:master?

@pohly pohly changed the base branch from master to release-2.2 May 5, 2021 19:51
@pohly
Copy link
Contributor Author

pohly commented May 5, 2021

Are you backporting to 2.2.1? Why does it say merging into kubernetes-csi:master?

My bad. I fixed the target base, now it is against release-2.2 as intended.

@pohly
Copy link
Contributor Author

pohly commented May 5, 2021

The alternative to this PR is to add a 2.2.1 changelog entry on master, tag there, and fast-forward release-2.2.

@k8s-ci-robot
Copy link
Contributor

@pohly: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-kubernetes-csi-external-provisioner-1-21-on-kubernetes-1-21 bddcf41 link /test pull-kubernetes-csi-external-provisioner-1-21-on-kubernetes-1-21

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@msau42
Copy link
Collaborator

msau42 commented May 5, 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 May 5, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, pohly

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 May 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit a7c22cd into kubernetes-csi:release-2.2 May 5, 2021
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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

6 participants