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.

Sign up for GitHub

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

Jump to bottom

chore: Sync main with release-2.10 #2203

Closed
wants to merge 7 commits into from
Closed

chore: Sync main with release-2.10 #2203

wants to merge 7 commits into from

Conversation

rexagod
Copy link
Member

@rexagod rexagod commented Sep 20, 2023

Prepping up for the v2.10.1 patch release.

mrueg and others added 5 commits September 13, 2023 00:27
@mrueg @rexagod
Fix: Remove FieldSelector from non-namespaced resources
9e55d96 
This should resolve the issue with namespace-denylist as discovered in #2187

Regression introduced in c3c5528

Signed-off-by: Manuel Rüger <[email protected]>
@dgrisonnet @rexagod
store: fix missing cluster-scoped resources
4482e2d 
Signed-off-by: Damien Grisonnet <[email protected]>
@rexagod
Bump Go to v1.20.8
7371474 
Signed-off-by: Pranshu Srivastava <[email protected]>
@rexagod
chore: Cut v2.10.1
1a59246 
Signed-off-by: Pranshu Srivastava <[email protected]>
@k8s-ci-robot
Merge pull request #2192 from rexagod/prep-v2.10.1
d68bad2 
chore: Cut `v2.10.1`
@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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 20, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 20, 2023
@rexagod rexagod changed the title Sync main with release-2.10 chore: Sync main with release-2.10 Sep 20, 2023
@rexagod
Copy link
Member Author

rexagod commented Sep 20, 2023

/cc @dgrisonnet

@rexagod
Copy link
Member Author

rexagod commented Sep 20, 2023

Once a release is out, I'll open up the kpromo PR. That's all that's left IMO.

@rexagod
Copy link
Member Author

rexagod commented Sep 20, 2023

I'd like to defer the release until after this is merged in main, just to be sure there are no more surprises for us, owing to the rebase conflicts I resolved on the release-2.10 branch (there's an additional commit on top of it that addresses the conflicts). Once this is in for good, I'll cut a release from release-2.10 and open the kpromo PR.

dgrisonnet
dgrisonnet reviewed Sep 20, 2023
View reviewed changes
Makefile
@@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z)
ALL_ARCH = amd64 arm arm64 ppc64le s390x
PKG = github.com/prometheus/common
PROMETHEUS_VERSION = 2.46.0
GO_VERSION = 1.21.1
GO_VERSION = 1.20.8
Copy link
Member

@dgrisonnet dgrisonnet Sep 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be synced. It is fine to have the go update diverge

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer having the release-2.10 diverge away from master and stick to go 1.20.z whilst master is on 1.21.z.

IIUC then shouldn't this change go in release-2.10, i.e., this PR (and resolve conflicts in the other PR, but leave that commit out of release so the release has go 1.20 whereas main has go 1.21?

@rexagod rexagod mentioned this pull request Sep 20, 2023
Closed
@dashpole
Copy link
Contributor

/assign @dgrisonnet
/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 Sep 21, 2023
@rexagod
Copy link
Member Author

rexagod commented Oct 3, 2023

/close

Based on #2204 (comment), I think with the growing complexity of the project, and chores it entails during the release process, it'd make sense to let the release branches diverge going forward, to be able to freely make release-specific changes, for instance, without unnecessary conflicts.

@rexagod rexagod closed this Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgrisonnet dgrisonnet dgrisonnet left review comments

@CatherineF-dev CatherineF-dev Awaiting requested review from CatherineF-dev

Assignees

@dgrisonnet dgrisonnet

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rexagod @k8s-ci-robot @dashpole @dgrisonnet @mrueg