Skip to content

[1.4] build(deps): bump github.com/coreos/go-systemd/v22 from 22.6.0 to 22.7.0#5094

Merged
lifubang merged 3 commits intoopencontainers:release-1.4from
kolyshkin:1.4-5093
Jan 29, 2026
Merged

[1.4] build(deps): bump github.com/coreos/go-systemd/v22 from 22.6.0 to 22.7.0#5094
lifubang merged 3 commits intoopencontainers:release-1.4from
kolyshkin:1.4-5093

Conversation

@kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Jan 28, 2026

This is a backport of #5094 and #5057 to release-1.4 branch.

For #5094: The fix in this go-systemd version (coreos/go-systemd#496) might fix the "Timed out while waiting for systemd to remove xxx" error we're periodically seeing, thus the backport. While technically this bump belongs to oc/systemd, when runc is being built, a version from runc's go.mod will be used if greater than one from cgroups go.mod (thanks to MVS).

For #5057: it's here mostly for the clean backport of the above.

Original description follows.


Bumps github.com/coreos/go-systemd/v22 from 22.6.0 to 22.7.0.


updated-dependencies:

  • dependency-name: github.com/coreos/go-systemd/v22 dependency-version: 22.7.0 dependency-type: direct:production update-type: version-update:semver-minor ...

(cherry picked from commit 9abc182)


Remove crypto/tls dependency
It appears that when we import github.com/coreos/go-systemd/activation,
it brings in the whole crypto/tls package (which is not used by runc
directly or indirectly), making the runc binary size larger and
potentially creating issues with FIPS compliance.

Let's copy the code of function we use from go-systemd/activation
to avoid that.

The space savings are:

$ size runc.before runc.after
text data bss dec hex filename
7101084 5049593 271560 12422237 bd8c5d runc.before
6508796 4623281 229128 11361205 ad5bb5 runc.after
Reported-by: @xnox

@kolyshkin kolyshkin added kind/dependency dependencies Pull requests that update a dependency file backport/1.4-pr A backport PR to release-1.4 labels Jan 28, 2026
kolyshkin and others added 3 commits January 28, 2026 12:08
It appears that when we import github.com/coreos/go-systemd/activation,
it brings in the whole crypto/tls package (which is not used by runc
directly or indirectly), making the runc binary size larger and
potentially creating issues with FIPS compliance.

Let's copy the code of function we use from go-systemd/activation
to avoid that.

The space savings are:

$ size runc.before runc.after
   text	   data	    bss	    dec	    hex	filename
7101084	5049593	 271560	12422237	 bd8c5d	runc.before
6508796	4623281	 229128	11361205	 ad5bb5	runc.after

Reported-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit ba9e60f)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Remove unused code and argument from the ActivationFiles,
and simplify its usage.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 6ede591)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Bumps [github.com/coreos/go-systemd/v22](https://github.com/coreos/go-systemd) from 22.6.0 to 22.7.0.
- [Release notes](https://github.com/coreos/go-systemd/releases)
- [Commits](coreos/go-systemd@v22.6.0...v22.7.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-systemd/v22
  dependency-version: 22.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 9abc182)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added this to the 1.4.1 milestone Jan 28, 2026
Copy link

@xnox xnox left a comment

Choose a reason for hiding this comment

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

With prejudice.

@lifubang lifubang merged commit 3747639 into opencontainers:release-1.4 Jan 29, 2026
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.4-pr A backport PR to release-1.4 dependencies Pull requests that update a dependency file kind/dependency

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants