Commit Graph

396 Commits

Author SHA1 Message Date
Chris Henzie
d2f67d3990 Forward RUNC_FLAVOR env var down to integration tests
Update Vagrantfile and cri-integration test runner to forward
RUNC_FLAVOR to the test environment.

Allows integration tests to conditionally skip testing certain cgroup
mount setups when running against other runtimes that may not support
them yet.

Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
2026-03-23 12:22:37 -07:00
Maksym Pavlenko
97c454066b Merge pull request #12844 from akhilerm/go-1.26
ci: add build/test go1.26.0, drop go1.24
2026-02-18 04:38:27 +00:00
Sebastiaan van Stijn
102bf8626a install-dev-tools: update protoc-gen-go-ttrpc to v1.2.7
Align with the version of ttrpc used.

full diff: https://github.com/containerd/ttrpc/compare/v1.2.5...v1.2.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-02-17 14:36:30 +01:00
Sebastiaan van Stijn
912a34ad06 script/test: fix dupword
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-02-16 20:45:16 +01:00
Akhil Mohan
9a0c5f1f02 ci: build/test go1.26.0
add go1.26.0 into test matrix and remove go1.24

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2026-02-12 09:03:43 +05:30
Sebastiaan van Stijn
1551986af4 update to go1.24.13, go1.25.7
go1.25.7 (released 2026-02-04) includes security fixes to the go command
and the crypto/tls package, as well as bug fixes to the compiler and the
crypto/x509 package. See the Go 1.25.7 milestone on our issue tracker for
details:
https://github.com/golang/go/issues?q=milestone%3AGo1.25.7+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.25.6...go1.25.7

From the security mailing list:

> Hello gophers,
>
> We have just released Go versions 1.25.7 and 1.24.13, minor point releases.
>
> These releases include 2 security fixes following the security policy:
>
> - cmd/cgo: remove user-content from doc strings in cgo ASTs
>
>   A discrepancy between how Go and C/C++ comments
>   were parsed allowed for code smuggling into the
>   resulting cgo binary.
>
>   To prevent this behavior, the cgo compiler
>   will no longer parse user-provided doc
>   comments.
>
>   Thank you to RyotaK (https://ryotak.net) of
>   GMO Flatt Security Inc. for reporting this issue.
>
>   This is CVE-2025-61732 and https://go.dev/issue/76697.
>
> - crypto/tls: unexpected session resumption when using Config.GetConfigForClient
>
>   Config.GetConfigForClient is documented to use the original Config's session
>   ticket keys unless explicitly overridden. This can cause unexpected behavior if
>   the returned Config modifies authentication parameters, like ClientCAs: a
>   connection initially established with the parent (or a sibling) Config can be
>   resumed, bypassing the modified authentication requirements.
>
>   If ClientAuth is VerifyClientCertIfGiven or RequireAndVerifyClientCert (on the
>   server) or InsecureSkipVerify is false (on the client), crypto/tls now checks
>   that the root of the previously-verified chain is still in ClientCAs/RootCAs
>   when resuming a connection.
>
>   Go 1.26 Release Candidate 2, Go 1.25.6, and Go 1.24.12 had fixed a similar issue
>   related to session ticket keys being implicitly shared by Config.Clone. Since
>   this fix is broader, the Config.Clone behavior change has been reverted.
>
>   Note that VerifyPeerCertificate still behaves as documented: it does not apply
>   to resumed connections. Applications that use Config.GetConfigForClient or
>   Config.Clone and do not wish to blindly resume connections established with the
>   original Config must use VerifyConnection instead (or SetSessionTicketKeys or
>   SessionTicketsDisabled).
>
>   Thanks to Coia Prant (github.com/rbqvq) for reporting this issue.
>
>   This updates CVE-2025-68121 and Go issue https://go.dev/issue/77217.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2026-02-07 21:55:44 +01:00
Fu Wei
72d5139380 Merge pull request #12819 from fuweid/followup-12714
script/critest.sh: always skip OOMKilled on systemd cgroup
2026-02-06 17:03:38 +00:00
Akhil Mohan
bde3deac7e ci: bump go 1.24.12, 1.25.6
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2026-02-01 22:25:49 +05:30
Wei Fu
c3ba452cf0 script/critest.sh: always skip OOMKilled on systemd cgroup
Skip the OOMKilled test when running with systemd cgroups, regardless of the
user-provided ginkgo skip list, to avoid this known issue.

```
critest '--ginkgo.skip=should prefer new apparmor field|should support apparmor field|should support deprecated apparmor_profile field|should support unsafe sysctls|should support safe sysctls|should allow privilege escalation when false'

Jan 23 08:55:25 c48dfdc00254 bash[130]: Summarizing 1 Failure:
Jan 23 08:55:25 c48dfdc00254 bash[130]:   [FAIL] [k8s.io] Container OOM runtime should output OOMKilled reason [It] should terminate with exitCode 137 and reason OOMKilled
Jan 23 08:55:25 c48dfdc00254 bash[130]:
sigs.k8s.io/cri-tools/pkg/validate/container_linux.go:165
```

REF: https://github.com/containerd/containerd/actions/runs/21280114724/job/61248062856

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-01-31 20:47:01 -05:00
Maksym Pavlenko
f87550d068 Install buf from install-dev-tools
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-01-08 17:03:28 -08:00
Maksym Pavlenko
edb3e08697 Remove protobuf
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2026-01-08 15:40:54 -08:00
Wei Fu
bdff34ef61 *: skip critest OOMKilled testcase for systemd cgroup
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-01-06 20:44:04 -05:00
Wei Fu
cbb1b13a81 cri-integration: add stress test for TestOOMEventMonitor
The test was validated locally by running 100 pods for 100 rounds without
observing any failures. Due to limited resources in the CI environment,
the test parameters were reduced to 8 pods and 10 rounds.

```bash
FOCUS=TestOOMEventMonitor CGROUP_DRIVER=cgroupfs taskset -c 0,1 make cri-integration | tee /tmp/log
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2026-01-06 20:44:04 -05:00
Austin Vazquez
127b163577 ci: bump Go 1.24.11, 1.25.5
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-12-03 09:53:26 -06:00
Austin Vazquez
65ad60ed9a ci: bump Go 1.24.10, 1.25.4
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-12-03 09:52:09 -06:00
Paweł Gronowski
fbb42c2a4f runc: Update runc binary to v1.4.0
v1.4.0 is the first release of the 1.4 release branch which is now
encouraged by the maintainers.

This update includes a fix for a regression introduced in CVE-2025-52881
mitigation patches where the `mode=` argument was incorrectly applied to
tmpfs mounts regardless of whether the target path existed.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-12-01 11:44:29 +01:00
ningmingxiao
8c98030c43 runc: Update runc binary to v1.3.3
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
2025-11-05 17:46:00 +08:00
Austin Vazquez
acbaa8a990 ci: bump Go 1.24.9, 1.25.3
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-04 09:20:38 -06:00
Derek McGowan
9ae0168c7f Add focus test option to critest
Allows easily running a single critest using the contrib test setup

Signed-off-by: Derek McGowan <derek@mcg.dev>
2025-10-19 09:03:19 -07:00
Austin Vazquez
c039f53490 ci: bump Go 1.24.8
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-10-08 17:45:00 -05:00
ningmingxiao
53d78b68d7 runc:Update runc binary to v1.3.1
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
2025-09-04 23:54:28 +08:00
Wei Fu
363e02310b install-runhcs-shim: fetch target commit instead of tags
No idea why it blames lock during fetching.

```bash
...
 * [new tag]           v0.9.9           -> v0.9.9
error: cannot lock ref 'refs/tags/v0.6.3': Unable to create 'C:/Users/runneradmin/AppData/Local/Temp/tmp.N2FTxfARN9/.git/refs/tags/v0.6.3.lock': File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
+ cleanup
+ rm -rf /tmp/tmp.N2FTxfARN9
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2025-08-29 00:08:40 -04:00
Krisztian Litkey
48f5d42558 script/test: clean up generated NRI test configuration.
Don't emit non-existing NRI options in the configuration
we generate for test.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
2025-08-22 13:11:16 +03:00
Maksym Pavlenko
1ce8e1ca0e Merge pull request #12073 from mikebrow/update-cri-tools
time to upgrade to 1.33 cri-tools
2025-08-18 21:46:55 +00:00
Kirtana Ashok
b595e0173e Update hcsshim to v0.14.0-rc.1
in preparation for containerd/2.2

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2025-08-18 11:08:05 -07:00
Austin Vazquez
db31fbc5a1 ci: bump Go 1.24.6
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-08-07 08:59:03 -05:00
Mike Brown
b70b43f6b6 time to upgrade to 1.33 cri-tools
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2025-07-29 21:08:56 +00:00
Akhil Mohan
118a841474 ci: update crun to 1.22
https://github.com/containers/crun/releases/tag/1.22

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-07-17 14:10:56 +05:30
Austin Vazquez
c5ad254a3a ci: bump Go 1.24.5
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-07-16 18:08:36 +00:00
Sebastiaan van Stijn
62bbdce7f5 update go-md2man binary to v2.0.7
We updated the vendored dependency, but the binary was still left
on an older version.

full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.2...v2.0.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-07-08 12:48:52 +02:00
Derek McGowan
4d89721f23 Merge pull request #11623 from yashsingh74/update-golangci-v2
ci: bump golangci from 6.5.2 to 7.0.0
2025-07-01 18:06:14 +00:00
Phil Estes
89b7202173 Merge pull request #12004 from austinvazquez/remove-unused-scripts-for-windows-2019
Remove unused Windows 2019 powershell scripts
2025-06-30 12:44:44 -04:00
Rehan Khan
621d661be8 Add coverage support for CRI integration tests
Signed-off-by: Rehan Khan <Rehan.Khan7@ibm.com>
2025-06-27 18:42:51 +05:30
Austin Vazquez
97bbc1f73a Remove unused Windows 2019 powershell scripts
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2025-06-19 15:32:46 -07:00
yashsingh74
ed7746656d ci: bump golangci from 6.5.2 to 7.0.0
Signed-off-by: yashsingh74 <yashsingh1774@gmail.com>
2025-06-18 14:16:41 +05:30
Austin Vazquez
415df38927 ci: bump Go 1.24.4 in CI
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2025-06-09 08:50:26 -06:00
Derek McGowan
f6ae79a0b6 Merge pull request #11834 from austinvazquez/bump-golang-versions-05062025-in-ci
ci: bump golang [1.23.9, 1.24.3] in build and release
2025-05-23 16:56:39 +00:00
Akhil Mohan
af24e463bc update runhcs to v0.13.0
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-05-13 20:49:38 +05:30
Austin Vazquez
fea77e15b5 ci: bump golang [1.23.9, 1.24.3] in build and release
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2025-05-11 20:57:35 -06:00
Austin Vazquez
4dfe4e8bef Update runc binary to v1.3.0
This is the first release of the 1.3.z release branch of runc. It
contains a few minor fixes for issues found in 1.3.0-rc.2.

This is the first release of runc that will follow our new release and
support policy (see RELEASES.md for more details). This means that, as
of this release:

    As of this release, the runc 1.2.z release branch will now only
    receive security and "significant" bugfixes.
    Users are encouraged to plan migrating to runc 1.3.0 as soon as
    possible.
    Due to its particular situation, runc 1.1.z is officially no longer
    supported and will no longer receive any updates (not even for
    critical security issues). Users are urged (in the strongest possible
    terms) to upgrade to a supported version of runc.
    Barring any future changes to our release policy, users should expect
    a runc 1.4.0 release in late October 2025.

full diff: https://github.com/opencontainers/runc/compare/v1.2.6...v1.3.0

Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2025-05-01 22:27:46 -06:00
Akhil Mohan
3851bd5402 fix unbound SKIP_TEST variable error
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-05-01 15:46:44 +05:30
ningmingxiao
0dcdc1ffa7 bump:update cni to v1.7.1
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
2025-04-27 12:25:28 +08:00
Akhil Mohan
5629e9fff7 update to go 1.24.2, 1.23.8
- go1.23.8 (released 2025-04-01) includes security fixes to the net/http
  package, as well as bug fixes to the runtime and the go command.
  Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.23.8+label%3ACherryPickApproved
- go1.24.2 (released 2025-04-01) includes security fixes to the net/http
  package, as well as bug fixes to the compiler, the runtime, the go
  command, and the crypto/tls, go/types, net/http, and testing packages.
  Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.24.2+label%3ACherryPickApproved

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-04-17 11:49:22 +05:30
Akhil Mohan
8e6c93b6b0 add option to skip tests in critest
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 4ba3d82ca2)
2025-04-16 16:23:40 -04:00
yylt
cffb6d4250 downgrade cni version in CI test
Signed-off-by: yang yang <yang8518296@163.com>
2025-03-28 15:37:50 +08:00
Austin Vazquez
3e96f1a51c Update runc binary to v1.2.6
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2025-03-19 17:07:23 +00:00
Akhil Mohan
4f090fe772 update to go1.23.7 / go1.24.1
- go1.23.7 (released 2025-03-04) includes security fixes to the net/http
package, as well as bug fixes to cgo, the compiler, and the reflect,
runtime, and syscall packages. See the Go 1.23.7 milestone on our issue
tracker for details

- go1.24.1 (released 2025-03-04) includes security fixes to the net/http
package, as well as bug fixes to cgo, the compiler, the go command, and
the reflect, runtime, and syscall packages. See the Go 1.24.1 milestone
on our issue tracker for details.

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-03-09 18:58:28 +05:30
Kirtana Ashok
6c02321f6e Merge pull request #11179 from ambarve/blocked_cim
Support for importing layers in the block CIM format.
2025-02-24 22:21:10 +00:00
Austin Vazquez
938775864a Update runc binary to v1.2.5
This is the fifth patch release in the 1.2.z series of runc. It
primarily fixes an issue caused by an upstream systemd bug.

There was a regression in systemd v230 which made the way we define device
rule restrictions require a systemctl daemon-reload for our transient
units. This caused issues for workloads using NVIDIA GPUs. Workaround the
upstream regression by re-arranging how the unit properties are defined.
Dependency github.com/cyphar/filepath-securejoin is updated to v0.4.1,
to allow projects that vendor runc to bump it as well.
CI: fixed criu-dev compilation.
Dependency golang.org/x/net is updated to 0.33.0.

diff: opencontainers/runc@v1.2.4...v1.2.5

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2025-02-14 03:53:06 +00:00
Akihiro Suda
df99aa321a update to go 1.24.0 / go1.23.6
https://go.dev/doc/go1.24

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-02-13 03:20:15 +09:00