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

Update to Go 1.23 and bump golang.org/x/crypto v0.36.0 #6060

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Mar 12, 2025

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Fixes: CVE-2025-22869
Fixes: https://issues.redhat.com/browse/RHEL-82771
Fixes: https://issues.redhat.com/browse/RHEL-81310

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Update minimum go version to 1.23

Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM

@lsm5
Copy link
Member

lsm5 commented Mar 12, 2025

@Luap99 Line 97 in .packit.yaml needs to be adjusted as well. Only do x86_64 arches over there. That will make the f40 testing-farm and rpm build job go away.

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM .

@Luap99
Copy link
Member Author

Luap99 commented Mar 12, 2025

@nalind @TomSweeneyRedHat PTAL

Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

LGTM otherwise — or if @lsm5 doesn’t think the comments are needed, please merge as is.

- fedora-latest-stable-x86_64
- fedora-latest-stable-aarch64
- fedora-development-x86_64
- fedora-development-aarch64
Copy link
Contributor

Choose a reason for hiding this comment

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

If the goal is to revert the targets changes in the file, a comment saying saying that we’d prefer to use fedora-all-… and that we are restricting F40 because of Go 1.22 would be nice (in both places).

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM otherwise — or if @lsm5 doesn’t think the comments are needed, please merge as is.

LGTM. I won't block on this. While commenting is surely nice, I'm guilty of not doing this in packit config myself. And we can switch back to fedora-all in about 2 months. Besides, I wonder how many people besides upstream maintainers and ones doing CI even care.

Looks like the branch needs a rebase though.

Copy link
Contributor

openshift-ci bot commented Mar 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, Luap99

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

@Luap99
Copy link
Member Author

Luap99 commented Mar 13, 2025

Looks like the branch needs a rebase though.

It really doesn't, there is no merge conflict here. If I have to rebase every time something unrelated merges we never get stuff in timely and waste a bunch of time rebasing.

@lsm5
Copy link
Member

lsm5 commented Mar 13, 2025

Looks like the branch needs a rebase though.

It really doesn't, there is no merge conflict here. If I have to rebase every time something unrelated merges we never get stuff in timely and waste a bunch of time rebasing.

Sure, but IIRC, out-of-date branches are blocked from merge on buildah for whatever reason. I noticed that in #5885 at least and I don't remember any conflicts there. But I'll wait for @nalind / @flouthoc to give a slash-lgtm and see if things are different this time.

@nalind
Copy link
Member

nalind commented Mar 13, 2025

I'm not aware of a mechanical requirement for rebasing when a PR is out of date, unless there's a merge conflict.

@Luap99
Copy link
Member Author

Luap99 commented Mar 13, 2025

Require branches to be up to date before merging This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

Looks like you have set this on here so github will block the merge, not sure if the openshift merge bot can merge regardless.

Luap99 added 4 commits March 13, 2025 14:32
Oh well, so much to paying attention to buildah CI. Nobody seemed to
have noticed that F40 is not tested, anyway now that we bumpt to go 1.23
we can no longer build on it until go 1.23 is shipped on f40 which might
still take a few weeks.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This also bumps us to go 1.23 as minimum supported version.

Fixes: CVE-2025-22869
Fixes: https://issues.redhat.com/browse/RHEL-82771
Fixes: https://issues.redhat.com/browse/RHEL-81310

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
go 1.22 is to old, once F40 is updated to go 1.23 we can revert this.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@nalind
Copy link
Member

nalind commented Mar 13, 2025

The bot evidently bypasses this (though I could've sworn we configured it to pay attention to branch protection rules a while back) — we've had merge commits within the last week.

@Luap99
Copy link
Member Author

Luap99 commented Mar 13, 2025

The openshift bot is only configured to block on "Total Success" in its config file. However I have seen inconstant results between github merge protection and the bot so honestly I don't even know what the expected behavior around it actually is.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants