Skip to content

Switch to opencontainers/cgroups#2345

Merged
openshift-merge-bot[bot] merged 2 commits into
containers:mainfrom
kolyshkin:cgr
Mar 13, 2025
Merged

Switch to opencontainers/cgroups#2345
openshift-merge-bot[bot] merged 2 commits into
containers:mainfrom
kolyshkin:cgr

Conversation

@kolyshkin

@kolyshkin kolyshkin commented Mar 4, 2025

Copy link
Copy Markdown
Contributor

Draft until switch to Go 1.23 is possible (podman switching to F41 in CI).

High-level overview:

1. Switch to Go 1.23.0 as a minimally required version.

2. Use Go 1.24.x for golangci-lint job.

3. Switch from golang.org/x/exp/maps to standard library's maps package.
Retrospectively, it was a mistake to use x/exp/maps because the API
changed when the package went into std (it now use iter.Seq).

The above is now in #2362.

  1. Switch to opencontainers/cgroups. This used to be part of runc but is living
    in a separate repo now.

  2. Fix an outdated ref to slices pkg.

Comment thread go.mod
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates

go 1.22.8
go 1.23.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not sure what your timeline here is but just to be clear:
We are not yet ready to move to go 1.23 as we still use f40 in podman CI. We have planned to switch soon once the f42 beta is out.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

My timeline is runc 1.3 release which is end of April. It looks like it is more or less in line with F42 beta release / F40 EOL.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We can actually do it earlier, as there's no runc 1.3 dependency

@kolyshkin kolyshkin changed the title deps: switch to opencontainers/cgroups Switch to Go 1.23, opencontainers/cgroups Mar 9, 2025
@kolyshkin

Copy link
Copy Markdown
Contributor Author

Just saw c/storage already updated to Go 1.23 here: containers/storage#2279

This is an addition to commit 71117d8 ("Replace golang.org/x/exp/slices
with slices from std").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The new opencontainers/cgroups repo used to be part of runc.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin

Copy link
Copy Markdown
Contributor Author

Ah, I see that #2362 cherry-picked Go 1.23 update from there.

So, this is no longer a draft.

@kolyshkin kolyshkin marked this pull request as ready for review March 12, 2025 22:54
@kolyshkin kolyshkin requested a review from Luap99 March 12, 2025 22:56
@kolyshkin kolyshkin changed the title Switch to Go 1.23, opencontainers/cgroups Switch to opencontainers/cgroups Mar 12, 2025

@Luap99 Luap99 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@openshift-ci

openshift-ci Bot commented Mar 13, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@rhatdan

rhatdan commented Mar 13, 2025

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Mar 13, 2025
@openshift-merge-bot openshift-merge-bot Bot merged commit d20cb55 into containers:main Mar 13, 2025
@Luap99

Luap99 commented Mar 17, 2025

Copy link
Copy Markdown
Member

@kolyshkin This is breaking podman as it still uses the runc types. Can you update podman as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants