Commit Graph

11738 Commits

Author SHA1 Message Date
Wei Fu
60d04b0b0f pkg: rename {blockio,rdt}_default.go -> nonlinux.go
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-02-12 08:35:17 +08:00
Wei Fu
62df35df66 *: introduce wrapper pkgs for blockio and rdt
Before this patch, both the RdtEnabled and BlockIOEnabled are provided
by services/tasks pkg. Since the services/tasks can be pkg plugin which
can be initialized multiple times or concurrently. It will fire data-race
issue as there is no mutex to protect `enable`.

This patch is aimed to provide wrapper pkgs to use intel/{blockio,rdt}
safely.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-02-10 08:21:34 +08:00
Samuel Karp
26509fa765
Merge pull request #8074 from kzys/fix-8073
Fixes https://github.com/containerd/containerd/issues/8073
2023-02-09 15:28:32 -08:00
Kazuyoshi Kato
617c66dcc7 Add critest.exe in $PATH
The binary location was moved since
https://github.com/kubernetes-sigs/cri-tools/pull/1085.

Fixes #8073.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2023-02-09 22:23:01 +00:00
Phil Estes
97480afdac
Merge pull request #7976 from yulng/lowercase
keep the uppercase letter for flag info
2023-02-07 09:54:38 +00:00
Fu Wei
20de989afc
Merge pull request #8049 from kiashok/updateShimTag
go.mod: Bump hcsshim to v0.10.0-rc.5
2023-02-06 22:24:33 +08:00
yulng
757b8f702b
keep the uppercase letter for flag info
Signed-off-by: yulng <wei.yang@daocloud.io>
2023-02-06 16:37:24 +08:00
Maksym Pavlenko
94934e1a47
Merge pull request #8045 from mxpv/sb
Fix sandbox exit monitor
2023-02-03 11:31:43 -08:00
Kirtana Ashok
e5c57f2422 update hcsshim tag to v0.10.0-rc.5 and revendor
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
2023-02-03 10:50:56 -08:00
Maksym Pavlenko
1f35b03369 Fix sandbox exit monitor
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-02-02 14:02:52 -08:00
Maksym Pavlenko
3d32da8f60
Merge pull request #7979 from mxpv/grpc
Generate GRPC contracts for runtime APIs
2023-02-02 11:49:32 -08:00
Maksym Pavlenko
d1cd9757eb Generate GRPC for runtime task service
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-02-02 09:58:43 -08:00
Maksym Pavlenko
86c238c873 Generate GRPC for runtime sandbox API
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-02-02 09:58:43 -08:00
Maksym Pavlenko
99580e0aad Update TTRPC and Protobuild dependencies
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-02-02 09:58:43 -08:00
Phil Estes
60363db5bc
Merge pull request #8035 from ktock/fixunmount
Make argument validation of `mount.UnmountRecursive` compatible to `mount.UnmountAll`
2023-02-02 11:55:24 -05:00
Phil Estes
6116820aeb
Merge pull request #8036 from ktock/remotesnlabel
Export remote snapshotter label handler
2023-02-02 11:53:43 -05:00
Fu Wei
6ed24c88ed
Merge pull request #7989 from mohitsharma-in/topic/directory-install-runhcs-shim
Adding support to run install hcsshim from local clone
2023-02-02 10:38:43 +08:00
Akihiro Suda
e6b515d463
Merge pull request #8040 from thaJeztah/update_urfave_cli
go.mod: github.com/urfave/cli v1.22.12
2023-02-02 08:26:05 +09:00
Phil Estes
eda079259d
Merge pull request #8039 from yankay/cleanup-useless-IntToInt32Array-func
cmd/ctr/commands: clean up the func IntToInt32Array in utils.go
2023-02-01 11:19:17 -05:00
Mohit Sharma
b9b44ed5c5 Removing end of line for last line
Signed-off-by: Mohit Sharma <mohit94614@gmail.com>
2023-02-01 20:44:23 +05:30
Kohei Tokunaga
dbf384a5a8 Export remote snapshotter label handler
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2023-02-01 23:03:23 +09:00
Sebastiaan van Stijn
d6070f8a74
go.mod: github.com/urfave/cli v1.22.12
full diff: https://github.com/urfave/cli/compare/v1.22.10...v1.22.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-02-01 12:42:03 +01:00
Kay Yan
2f1aad03af
cleanup useless IntToInt32Array func
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
2023-02-01 12:14:46 +08:00
Phil Estes
0181b103ea
Merge pull request #8037 from AkihiroSuda/epoch-drop-timezone
pkg/epoch: drop timezone
2023-01-31 17:04:50 -05:00
Phil Estes
58ad67caee
Merge pull request #8034 from klihub/deps/update-nri
go.mod: update github.com/containerd/nri.
2023-01-31 17:03:57 -05:00
Phil Estes
d9d74c14b4
Merge pull request #8013 from profnandaa/patch-2
fix(docs): minor fix on the windows installation steps
2023-01-31 17:03:35 -05:00
Akihiro Suda
e551d734fb
pkg/epoch: drop timezone
For determinism of human-readable string representation.
e.g., "2023-01-10T12:34:56Z" vs "2023-01-10T21:34:56+09:00"

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-31 23:26:02 +09:00
Kohei Tokunaga
eeab052425 Make mount.UnmountRecursive compatible to mount.UnmountAll
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2023-01-31 22:07:44 +09:00
Krisztian Litkey
58bd5a0940 go.mod: update github.com/containerd/nri.
Point NRI dependency to latest HEAD, commit b3cabdec0657. That
pulls in the necessary NRI fix for a recently discovered panic
and crash.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
2023-01-31 15:03:45 +02:00
Samuel Karp
e307f87971
Merge pull request #7847 from fangn2/adding-integration-test-to-opentelemetry 2023-01-30 23:45:57 -08:00
Tony Fang
c46aaa8df4 Add integration test for tracing on image pull
Create an in-memory exporter and global tracer provider
Pull image with client which should create spans
Validate spans in the exporter

Signed-off-by: Tony Fang <nhfang@amazon.com>
2023-01-31 05:45:26 +00:00
Derek McGowan
287320d4de
Merge pull request #7840 from hinshun/feature/mount-subdirectory
Use mount.Target to specify subdirectory of rootfs mount
2023-01-30 21:35:34 -08:00
Derek McGowan
ee0e22f01c
Merge pull request #8020 from AkihiroSuda/mkdir-etc-cni-0755
cri: mkdir /etc/cni with 0755, not 0700
2023-01-30 10:21:30 -08:00
Phil Estes
0b81378be6
Merge pull request #8025 from fuweid/enhance-testlog
log/logtest: add `testcase` as debug field
2023-01-30 11:40:15 -05:00
Akihiro Suda
b5bdd6c7f2
Merge pull request #8027 from AkihiroSuda/containerd-cgroups-v3
go.mod: github.com/containerd/cgroups/v3 v3.0.0
2023-01-30 23:06:47 +09:00
Fu Wei
c3e236182b
Merge pull request #7977 from adisky/update-cni-version
Update CNI plugins to 1.2.0
2023-01-30 21:39:10 +08:00
Aditi
7ec75b1207 Update CNI to 1.2.0
Signed-off-by: Aditi <sharmaad@vmware.com>
2023-01-30 10:25:37 +00:00
Samuel Karp
3695f29c3c
Merge pull request #8026 from AkihiroSuda/otel-1.12.0 2023-01-29 22:16:59 -08:00
Fu Wei
f0f6912a8f
Merge pull request #8007 from mxpv/events
Move PLEG events for pause container under podsandbox package
2023-01-30 14:16:14 +08:00
Fu Wei
5d482fdd6b
Merge pull request #8012 from dcantah/runtime-clarifications
runtime docs: Clarify delete cwd behavior
2023-01-30 14:06:32 +08:00
Akihiro Suda
306db3e707
go.mod: github.com/containerd/cgroups/v3 v3.0.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-30 11:57:46 +09:00
Fu Wei
9857b5d1bb
Merge pull request #8019 from AkihiroSuda/add-cri-containerd-deprecated
release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles
2023-01-30 10:20:57 +08:00
Akihiro Suda
5082fb3958
go.mod: go.opentelemetry.io/otel v1.12.0
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-01-30 08:40:46 +09:00
Akihiro Suda
967979efdc
Merge pull request #8022 from fuweid/update-release
RELEASES.md: update release status
2023-01-29 23:58:36 +09:00
Fu Wei
aef75c4183
Merge pull request #8023 from fuweid/fix-7965
deflake: TestContainerPids
2023-01-29 19:00:09 +08:00
Wei Fu
8886b05dc3 integration: use sleep inf with busybox:1.36
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 18:02:18 +08:00
Wei Fu
005d30e849 deflake: TestContainerPids
It is kind of race because `sleep 1s` is short live process.

See: https://github.com/containerd/containerd/issues/7965#issuecomment-1383218025
Fixes: #7965

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 16:51:52 +08:00
Samuel Karp
fbf145b312
Merge pull request #8021 from AkihiroSuda/release-ubuntu-20.04
Fix https://github.com/containerd/containerd/issues/7961
2023-01-28 23:45:15 -08:00
Wei Fu
6de94a4cc1 log/logtest: add testcase as debug field
It is hard to tell where the `log_hook` log comes from, when we run test
parallelly. Add test name as field as debug purpose.

```
log_hook.go:47: time="2023-01-29T13:09:37.687070239+08:00" level=debug msg=fetch func=remotes.Fetch file="/home/fuwei/go/src/github.com/containerd/containerd/remotes/handlers.go:114" digest="sha256:ea362f368469f909a95f9a6e54ebe0121ce0a8e3c30583dd9c5fb35b14544dec" mediatype=application/vnd.docker.image.rootfs.diff.tar.gzip size=28566425 testcase=TestCRIImagePullTimeout/NoDataTransferred
```

REF: #8024

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 13:09:55 +08:00
Wei Fu
97ddac539e RELEASES.md: update release status
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-01-29 11:46:33 +08:00