Commit Graph

14496 Commits

Author SHA1 Message Date
Danny Canter
15b13fb3ea Windows: Supply windows shim version via file
Somewhat similar to how we supply the version of runc to grab for testing via
a file in script/, this change supplies the Windows shim version to build off
of via a file in the same directory. This seems like a decent home given it now
lives next to the script that pulls and builds the shim to include in our build
artifacts/locally.

The motivation behind this change is:

Cut down on unneccessary hcsshim vendorings if no library code for containerd
changed. It was some what clunky how the Windows builds work today. The Windows
shim is developed out of tree at github.com/microsoft/hcsshim. To let containerd know
what tag to build the shim off of we'd vendor hcsshim into containerd, and then
parse the version string from go.mod, fetch this tag, and then build the shim and
include it in our artifacts. As mentioned, often times the vendoring would bring in
no actual changes that would affect containerd's usage of hcsshim as a library, and
would just serve as a means to bump the version of the containerd shim we should build.

Now this process can be a one line change and we can avoid the possible headaches that come
with bumping go.mod (bumping other unrelated deps etc.)

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-08-28 11:55:55 -07:00
Derek McGowan
c0111909a7
Merge pull request #9009 from dcantah/block-file-recreate
Blockfile: Expose RecreateScratch option
2023-08-28 11:53:56 -07:00
Derek McGowan
2a806c710a
Merge pull request #9017 from Juneezee/refactor/redundant-nil-check
Remove redundant nil check
2023-08-28 06:55:10 -07:00
Akhil Mohan
7a0ad09a0d
make repositories of install dependencies configurable
make repositories of dependencies like runc, crun, cni and critools configurable

Signed-off-by: Akhil Mohan <makhil@vmware.com>
2023-08-28 18:43:41 +05:30
Eng Zer Jun
34def8b33b
Remove redundant nil check
From the Go docs:

  "For a nil slice, the number of iterations is 0." [1]

Both `info.RootFS` and `host.clientPairs` are slices. Therefore, an
additional nil check for before the loop is unnecessary.

[1]: https://go.dev/ref/spec#For_range

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
2023-08-27 17:56:27 +08:00
Jin Dong
fc45365fa1 Remove most logrus
Signed-off-by: Jin Dong <jin.dong@databricks.com>
2023-08-26 14:31:53 -04:00
Derek McGowan
03e4f1e363
Merge pull request #9006 from bart0sh/PR010-update-LTS-doc
Update LTS description
2023-08-25 10:22:18 -07:00
Maksym Pavlenko
871a94a465
Merge pull request #8565 from samuelkarp/ctr-override-mounts
ctr: allow run to override mounts
2023-08-25 10:01:11 -07:00
Enrico Weigelt, metux IT consult
f9c35feb30 Makefile: allow overriding GO_BUILD_FLAGS via environment
Allow overriding GO_BUILD_FLAGS via environment, do distros can easily
inject additionally required build flags (eg. -buildvcs=false).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2023-08-25 16:26:13 +02:00
Phil Estes
adbc13c3e2
Merge pull request #9011 from AkihiroSuda/continuity-v0.4.2
go.mod: github.com/containerd/continuity v0.4.2
2023-08-25 09:25:55 -04:00
Akihiro Suda
490905be6f
go.mod: github.com/containerd/continuity v0.4.2
https://github.com/containerd/continuity/compare/1e0d26eb2381...v0.4.2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2023-08-25 16:39:55 +09:00
Ed Bartosh
03abceac56 Update LTS description
Explicitly mentioned a possibility to take feature backports
to support new Kubernetes releases.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2023-08-25 10:33:32 +03:00
Danny Canter
34f32043bc Blockfile: Expose RecreateScratch option
This was the only option not configurable from the toml for the plugin.
This is useful if you want to restart containerd and try a different
blockfile/size for the snapshotter.

Signed-off-by: Danny Canter <danny@dcantah.dev>
2023-08-24 13:28:22 -07:00
Derek McGowan
db5fc4ab45
Merge pull request #9008 from mxpv/stale
Add stale bot
2023-08-24 13:21:59 -07:00
Phil Estes
ba56b1fb3b
Merge pull request #9007 from champtar/critools-1.28.0
Update critools to 1.28.0
2023-08-24 15:56:53 -04:00
Maksym Pavlenko
b4f487ce9d
Apply suggestions from code review
Co-authored-by: Samuel Karp <me@samuelkarp.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-08-24 09:56:17 -07:00
Maksym Pavlenko
1e3540e110 Add stale bot
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-08-24 09:28:40 -07:00
Etienne Champetier
4e236962fe Update critools to 1.28.0
https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.28.0

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
2023-08-24 11:15:24 -04:00
Akihiro Suda
f48bbef193
Merge pull request #8994 from mxpv/cri
Use sandboxed CRI by default
2023-08-24 13:42:58 +09:00
Phil Estes
8e7a25856b
Merge pull request #8998 from dmcgowan/image-inspect
ctr: images inspect
2023-08-23 14:12:56 -04:00
Phil Estes
1ffe80c7f6
Merge pull request #8730 from thaJeztah/sprint_less
replace some fmt.Sprintfs with strconv
2023-08-23 12:02:09 -04:00
Maksym Pavlenko
c92f4a160e
Update RELEASES
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-08-23 08:50:42 -07:00
Maksym Pavlenko
c3f3cad287
Use sandboxed CRI by default
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-08-23 08:50:40 -07:00
Maksym Pavlenko
e7dee269d6
Merge pull request #8960 from dcantah/sandbox-annotations
Sandbox: Add annotations to CreateSandbox surface
2023-08-23 08:42:46 -07:00
Sebastiaan van Stijn
b76cd4d9fd
replace some fmt.Sprintfs with strconv
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-08-23 16:43:02 +02:00
Derek McGowan
bbdbf7ab6c
Add inspect image commands
Outputs the image structure as a tree with an option to show content
and related labels for the image.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-08-23 06:52:35 -07:00
Derek McGowan
78308b4a44
Add manifest printer library
Signed-off-by: Derek McGowan <derek@mcg.dev>
2023-08-23 06:52:35 -07:00
Sebastiaan van Stijn
11a5dd8265
snapshots: replace some fmt.Sprintfs with strconv
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-08-23 10:10:59 +02:00
Sebastiaan van Stijn
06765c9ef5
oci: replace some fmt.Sprintfs with strconv
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-08-23 10:10:59 +02:00
Sebastiaan van Stijn
710d22366d
removes/docker: replace some fmt.Sprintfs with strconv
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-08-23 10:10:59 +02:00
Sebastiaan van Stijn
d7bc8694be
pkg/cri: replace some fmt.Sprintfs with strconv
Teeny-tiny optimizations:

    BenchmarkSprintf-10       37735996    32.31  ns/op  0 B/op  0 allocs/op
    BenchmarkItoa-10         591945836     2.031 ns/op  0 B/op  0 allocs/op
    BenchmarkFormatUint-10   593701444     2.014 ns/op  0 B/op  0 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-08-23 10:10:56 +02:00
Fu Wei
738c153573
Merge pull request #8992 from djdongjin/remove-hashicorp-multierror
Remove hashicorp/go-multierror dependency
2023-08-23 13:13:51 +08:00
Maksym Pavlenko
36dcc294ee
Merge pull request #8995 from yankay/append-k8s-1.28-to-releases
Append k8s 1.28 to RELEASES.md
2023-08-22 19:23:46 -07:00
Derek McGowan
55c877297a
Merge pull request #8556 from Wang99998/main
Update default platform matcher when ctr import
2023-08-22 16:53:42 -07:00
Derek McGowan
1aa710d0fc
Merge pull request #8694 from yankay/fix-push-image-rate
Fix ctr push image can't show right rate
2023-08-22 16:39:35 -07:00
Derek McGowan
2bac6ffb79
Merge pull request #8663 from helen-frank/feature/MergeSortedStringSlices
MergeStringSlices use sets
2023-08-22 16:31:28 -07:00
Derek McGowan
7f029af018
Merge pull request #8938 from akhramov/freebsd/fix-tar-headers-2
archive/tarheader: fix FreeBSD hdr for regular files
2023-08-22 16:25:50 -07:00
Phil Estes
de066a37dc
Merge pull request #8935 from lengrongfu/feat/add-metrics-for-dropped-events
add metrics for discarding events
2023-08-22 09:09:31 -04:00
Kay Yan
73e9cfd1ce append k8s 1.28 to releases
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
2023-08-22 10:52:00 +00:00
Fu Wei
f9dec2aeae
Merge pull request #8569 from fuweid/add-dmesg-for-unit-test
.github/workflows: add dmesg step for integration-linux
2023-08-22 18:36:29 +08:00
Fu Wei
3ffde050a4
Merge pull request #8988 from kinvolk/rata/userns-fix-platform
cri: Fix sandbox_mode "shim"
2023-08-22 16:40:34 +08:00
Jin Dong
6d8329d7f5 Remove unnecessary joinError unwrap
Signed-off-by: Jin Dong <jin.dong@databricks.com>
2023-08-21 19:03:41 -07:00
Derek McGowan
fb786b2f17
Merge pull request #8945 from pdtpartners/feature/make-overlay-snapshotter-embeddable
Add WithMetaStore to overlay snapshotter to allow bringing your own
2023-08-21 15:47:15 -07:00
Derek McGowan
b8f32e863c
Merge pull request #8951 from kiashok/exposeCommitMemWindows
Populate commit memory for windows memory usage stats
2023-08-21 15:42:34 -07:00
Derek McGowan
3ba8964e22
Merge pull request #8889 from wic006/wic006/update-rfc-link
archive/compression: update out of date RFC draft link
2023-08-21 15:15:18 -07:00
Derek McGowan
bc15df7231
Merge pull request #8894 from thaJeztah/log_improve
log: cleanups and improvements to decouple more from logrus
2023-08-21 15:08:18 -07:00
Maksym Pavlenko
90b8e6b711
Merge pull request #8915 from oss-qm/submit/bindir
Makefile: allow overriding the binary executable target dir
2023-08-21 11:38:20 -07:00
Maksym Pavlenko
579b257472
Merge pull request #8990 from jsturtevant/bump-go-fuzz
Remove temporary replace for fuzzer library
2023-08-21 10:55:07 -07:00
James Sturtevant
8399a4ee71 Remove temporary replace
Signed-off-by: James Sturtevant <jstur@microsoft.com>
2023-08-21 16:29:18 +00:00
Derek McGowan
df1ddc46b0
Merge pull request #8991 from dcantah/remote-differ-docs
Docs: Document proxy plugins diff support
2023-08-21 09:27:56 -07:00