-
Notifications
You must be signed in to change notification settings - Fork 2k
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
revert: Revert sync-based commits #2213
revert: Revert sync-based commits #2213
Conversation
This reverts commit 995f83e.
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rexagod 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 |
Wait why are we building with go 1.21 (https://github.com/kubernetes/kube-state-metrics/blob/release-2.10/Dockerfile) on release-2.10, but the go version is marked to be 1.20.8 (https://github.com/kubernetes/kube-state-metrics/blob/release-2.10/Makefile#L19)? |
Yeah something odd happened when the branch was rebase onto main. The tag seem to be fine on 1.20: https://github.com/kubernetes/kube-state-metrics/commits/v2.10.0 |
An additional reason for not merging back |
/triage accepted |
/assign @dgrisonnet |
Seems like #2213 (comment) came in from 435aa5a. Closing this PR and continuing this effort over at #2214. |
This reverts commit 98ade63, reversing changes made to d68bad2.
main
was merged intorelease-2.10
to make the whole "merge back tomain
" process predictable, so there's no conflicts, while creating av2.10.1
release from theHEAD~2
commit (the last commit before the mergemain
intorelease-2.10
happened). But none of that applies anymore since we will be letting release branches diverge going forward, allowing for easier patch releases, be it CVEs, critical fixes, etc. without the need to merge back into main. Whether we'll do the same for minor version releases as well, is up for discussion at this moment.Also note that the last commit regarding lint fixes was done owing to the
markdownlint
check that got in during the merge, which is also reverted in this PR.cc @dgrisonnet