github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,325 Commits 3 Branches 2 Tags 112 MiB
d34725f85a
Commit Graph

13325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Karp
3233d5d6f5
Merge pull request #7845 from dcantah/fix-noip-onrestart 
Fixes https://github.com/containerd/containerd/issues/7843
 2022-12-20 14:28:54 -08:00
Tony Fang
6e55234c38 Add unit test to function GetCPUVariantFromArch 
Add unit test to function GetCPUVariantFromArch
Fix import issue on non-linux platforms
Fix some style issue

Signed-off-by: Tony Fang <nenghui.fang@gmail.com>
 2022-12-20 22:00:12 +00:00
Tony Fang
8d5c045435 Use uname machine field to get CPU variant if fails at /proc/cpuinfo 
When images/containers in ARM arch were built/executed on x86 host,
getCPUVariant will fail as it tries to look for /proc/cpuinfo, whose
content is from the host. Adding a new method as fallback to check uname
machine when it happens.

Signed-off-by: Tony Fang <nenghui.fang@gmail.com>
 2022-12-20 21:59:32 +00:00
Derek McGowan
bd61843a25
Merge pull request #7081 from kzys/old-kernel 
Enable checkRename test
 2022-12-20 13:43:22 -08:00
Derek McGowan
8b3ed9f4ee
Merge pull request #7781 from dcantah/withtransaction 
metastore: Add WithTransaction convenience method
 2022-12-20 13:42:03 -08:00
Danny Canter
3ee6dd5c1b CRI: Fix no CNI info for pod sandbox on restart 
Due to when we were updating the pod sandboxes underlying container
object, the pointer to the sandbox would have the right info, but
the on-disk representation of the data was behind. This would cause
the data returned from loading any sandboxes after a restart to have
no CNI result or IP information for the pod.

This change does an additional update to the on-disk container info
right after we invoke the CNI plugin so the metadata for the CNI result
and other networking information is properly flushed to disk.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2022-12-20 13:20:27 -08:00
Fu Wei
dd5605e444
Merge pull request #7831 from kzys/fix-race 2022-12-20 20:37:50 +08:00
Danny Canter
aa8a389c51 overlay snapshotter: Make use of WithTransaction 
Move the overlay snapshotter over to using the WithTransaction convenience
method. This simplifies needing to check if we need to rollback a transaction
and saves us from needing to manually Commit ourselves.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2022-12-19 22:49:28 -08:00
Derek McGowan
2c573de6d3
Move snapshot event publishing into metadata store 
Removes the snapshot event publishing from the snapshot service.

Adds an option to metadata db to add a publisher. Adds event
publishing to prepare, commit, and remove snapshot operations.
Adds remove snapshot event to garbage collection.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-19 17:05:28 -08:00
Kazuyoshi Kato
d5dd11dcdc Enable checkRename test 
One of the cases wouldn't work on overlayfs, but other cases and/or
snapshotters should be tested.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-12-19 22:06:07 +00:00
Derek McGowan
8f7cfbda29
Merge pull request #7836 from AkihiroSuda/fix-7828 
cri: fix `memory.memsw.limit_in_bytes: no such file or directory`
 2022-12-18 22:12:55 -08:00
Akihiro Suda
4157503881
cri: fix memory.memsw.limit_in_bytes: no such file or directory 
Skip automatic `if swapLimit == 0 { s.Linux.Resources.Memory.Swap = &limit }` when the swap controller is missing.
(default on Ubuntu 20.04)

Fix issue 7828 (regression in PR 7783 "cri: make swapping disabled with memory limit")

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-19 11:28:07 +09:00
Kazuyoshi Kato
791428005f Prevent a race condition in testHook 
The logger could be called from multiple goroutines,
but t.Log() is not designed for.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-12-16 23:50:38 +00:00
Phil Estes
544e31c426
Merge pull request #7824 from thaJeztah/bump_fuzz_dep 
go.mod: update fuzz-headers and fuzz-build
 2022-12-16 12:15:41 -05:00
Fu Wei
5ef7ea4289
Merge pull request #7825 from kzys/no-gogo 
Remove github.com/gogo/protobuf again
 2022-12-16 15:43:51 +08:00
Kazuyoshi Kato
54f1bdee30 "make proto-fmt" doesn't like spaces 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-12-15 22:54:15 +00:00
Kazuyoshi Kato
52a7480399 Remove github.com/gogo/protobuf again 
While we need to support CRI v1alpha2, the implementation doesn't have
to be tied to gogo/protobuf.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-12-15 22:54:15 +00:00
Derek McGowan
a4bc380b91
Merge pull request #7814 from dcantah/hostnet-helper 
CRI: Add host networking helper
 2022-12-15 11:21:45 -08:00
Sebastiaan van Stijn
ce4ea26953
go.mod: update fuzz-headers and fuzz-build 
Slowly chipping away non-tagged golang.org/x/ packages

diffs:

- b2031950a3...5330a85ea6
- 3345c89a7c...d395f97c48

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-15 17:36:05 +01:00
Fu Wei
12f30e6524
Merge pull request #7792 from mxpv/sb-shutdown 2022-12-15 13:37:35 +08:00
Maksym Pavlenko
a4d5c3e5cb Support sandboxed shims shutdown 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-14 18:22:52 -08:00
Kazuyoshi Kato
32f6e6c8aa
Merge pull request #7818 from mikebrow/cri-tools-vendor-1.26 
move up to CRI-TOOLS v1.26.0
 2022-12-14 14:13:54 -08:00
Mike Brown
fb7a04234b move up to CRI-TOOLS v1.26.0 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2022-12-14 11:54:35 -06:00
Phil Estes
9b39b0bfd9
Merge pull request #7812 from mxpv/cri 
Minor fix when querying pod sandbox status
 2022-12-14 10:15:03 -05:00
Danny Canter
84529072d2 CRI: Add host networking helper 
We do a ton of host networking checks around the CRI plugin, all mainly
doing the same thing of checking the different quirks on various platforms
(for windows are we a HostProcess pod, for linux is namespace mode the
right thing, darwin doesn't have CNI support etc.) which could all be
bundled up into a small helper that can be re-used.

Signed-off-by: Danny Canter <danny@dcantah.dev>
 2022-12-14 01:47:22 -08:00
Maksym Pavlenko
371e27ffb2
Merge pull request #7809 from mikebrow/check-deep-copies-on-restart 
nil check to avoid panic on upgrade
 2022-12-13 22:22:20 -08:00
Maksym Pavlenko
373c26d585
Merge pull request #7709 from lucacome/bump-grpc 
Bump grpc to v1.51.0
 2022-12-13 22:21:00 -08:00
Maksym Pavlenko
0e33a8fa4f [sb] Fix status 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-13 16:35:15 -08:00
Derek McGowan
c666147592
Merge pull request #7805 from chaunceyjiang/painc 
fatal error: concurrent map iteration and map write
 2022-12-13 15:01:25 -08:00
Kazuyoshi Kato
0100595ae9
Merge pull request #7804 from lucacome/bump-golangci 
Bump golangci-lint to v1.50.1
 2022-12-13 14:41:26 -08:00
Mike Brown
ce3a732709 nil check to avoid panic on upgrade 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2022-12-13 16:18:18 -06:00
Phil Estes
ecf00ffe84
Merge pull request #7783 from inspektor-gadget/qasim/cri-disable-swap 
cri: make swapping disabled with memory limit
 2022-12-13 15:21:51 -05:00
chaunceyjiang
5a3a9baec9 fatal error: concurrent map iteration and map write 
Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
 2022-12-13 20:08:23 +08:00
Fu Wei
d2f68bfb36
Merge pull request #7313 from pacoxu/image-pull-metrics 
add metrics for image pulling: error; in progress count; thoughput
 2022-12-13 19:49:22 +08:00
Luca Comellini
c5fff10fe7
Bump golangci-lint to v1.50.1 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-12-12 22:48:55 -08:00
Derek McGowan
7db53e0e8c
Merge pull request #7793 from dmcgowan/prepare-v1.7.0-beta.1 
Prepare release notes for v1.7.0-beta.1
 2022-12-12 21:24:08 -08:00
Phil Estes
2a76a1e78d
Merge pull request #7771 from akhilerm/fetch-from-private-buckets 
support fetching containerd from non public GCS buckets
 2022-12-12 13:06:21 -05:00
Phil Estes
133ddce7cf
Merge pull request #7651 from AkihiroSuda/custom-image-createdat 
images: support specifying SourceDateEpoch via ctx
 2022-12-12 12:59:38 -05:00
Derek McGowan
182375794d
Merge pull request #7718 from AdamKorcz/fuzz1234 
fuzzing: improve archive fuzzer
 2022-12-12 09:29:34 -08:00
Luca Comellini
d7507c3c13
Bump grpc to v1.51.0 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-12-12 09:16:53 -08:00
Akhil Mohan
b94c1018af
disable tracing while handling token 
Signed-off-by: Akhil Mohan <makhil@vmware.com>
 2022-12-12 19:19:48 +05:30
Fu Wei
5e51347a63
Merge pull request #7798 from calvin0327/fix-sdNotify 
fix sdNotify func when debug level
 2022-12-12 14:36:12 +08:00
calvin0327
f219f7d1ea fix sdNotify func when debug level 
Signed-off-by: wen chen <wen.chen@daocloud.io>
 2022-12-12 10:06:35 +08:00
Akihiro Suda
75b09ac4a7
images: support specifying SourceDateEpoch via ctx 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-12 09:02:35 +09:00
Akihiro Suda
dc48349248
epoch: propagate SOURCE_DATE_EPOCH via ctx 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-12-12 09:02:35 +09:00
Maksym Pavlenko
36641eade6
Merge pull request #7794 from austinvazquez/upgrade-github-actions-packages 
Upgrade GitHub actions packages in release workflow
 2022-12-11 10:37:34 -08:00
Samuel Karp
e3ceecf92e
Merge pull request #7796 from austinvazquez/enable-local-linux-ci 
Enable GitHub Actions local Linux CI runs
 2022-12-11 00:30:16 -08:00
Austin Vazquez
66f71ea4d5 Enable GitHub Actions local Linux CI runs 
Sync package index and automatic yes to apt repository prompts.

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2022-12-11 04:37:21 +00:00
Austin Vazquez
14a38e12b7
Upgrade GitHub actions packages in release workflow 
Resolve NodeJS 12 and command deprecation warnings by upgrading
docker/setup-buildx-action and crazy-max/ghaction-github-runtime
packages.

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2022-12-10 07:58:35 +00:00
Derek McGowan
33e706aec6
Prepare release notes for v1.7.0-beta.1 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2022-12-09 15:59:59 -08:00