Skip to content
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

Closed

Conversation

rexagod
Copy link
Member

@rexagod rexagod commented Oct 4, 2023

This reverts commit 98ade63, reversing changes made to d68bad2.


main was merged into release-2.10 to make the whole "merge back to main" process predictable, so there's no conflicts, while creating a v2.10.1 release from the HEAD~2 commit (the last commit before the merge main into release-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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 4, 2023
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 4, 2023
@rexagod rexagod changed the title Revert sync-based commits revert: Revert sync-based commits Oct 4, 2023
@dgrisonnet
Copy link
Member

dgrisonnet commented Oct 5, 2023

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)?

@dgrisonnet
Copy link
Member

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

@dgrisonnet
Copy link
Member

An additional reason for not merging back

@dgrisonnet
Copy link
Member

@rexagod should we perhaps revert everything since the v2.10.0 cut and then I cherry-pick #2190 properly and you do #2192 again?

@dashpole
Copy link

dashpole commented Oct 5, 2023

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 5, 2023
@dashpole
Copy link

dashpole commented Oct 5, 2023

/assign @dgrisonnet

@rexagod
Copy link
Member Author

rexagod commented Oct 8, 2023

Seems like #2213 (comment) came in from 435aa5a. Closing this PR and continuing this effort over at #2214.

@rexagod rexagod closed this Oct 8, 2023
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. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants