Commit Graph

11956 Commits

Author SHA1 Message Date
Phil Estes
d9fc5f4b00
Enable git commands due to git CVE fix
Add /vagrant to "safe directory" global git config so Vagrant runs work
properly again.

Signed-off-by: Phil Estes <estesp@amazon.com>
2022-05-09 15:42:33 -04:00
Derek McGowan
1e749e5f04
Merge pull request #6912 from aznashwan/windows-ci-junit-outfile
Pass explicit JUnit outfile to critest.exe in Windows workflow.
2022-05-09 12:19:50 -07:00
Nashwan Azhari
09c2c2a753 Pass explicit JUnit outfile to critest.exe in Windows workflow.
Following kubernetes-sigs/cri-tools#910 the Ginkgo reporters are left
configured with default settings and thus do not generate a JUnit report
file unless we explicitly pass a path for the outfile in the Windows
workflow when calling critest.exe.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2022-05-09 19:42:22 +03:00
Gavin Inglis
2c98a7b099 ctr import: strictly match platform
Currently, ctr import will use loose matching as defined by
platforms.Only(), meaning in the case of platform linux/amd64 as in
issue#6441, importing will also match linux/386 platform on the
image-to-be-imported's index. However, that image-to-be-imported may not
have both the linux/amd64 and linux/386 platform contents, resulting in
a failure to unpack the image. This change makes that check strict such
that the requested platform to import for is the only platform content
imported. Both ctr pull and ctr export will treat the platform option as
strict, so this change makes ctr import consistent with those.

resolves #6441

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
2022-05-06 22:44:43 +00:00
Kazuyoshi Kato
68d9d462c9
Merge pull request #6894 from psschwei/update-critools
Update critools to v1.24
2022-05-06 14:08:04 -07:00
Daniel Canter
d1c49781ed go.mod: Bump k8s deps to v0.24.0
This ends up bumping the prometheus client as well.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-05-06 13:37:15 -07:00
Phil Estes
0887262987
Merge pull request #6904 from ginglis13/devmapper-docs
devmapper docs: small fixes
2022-05-06 21:29:58 +01:00
Gavin Inglis
c721c8e274 devmapper docs: small fixes
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
2022-05-06 18:34:06 +00:00
Paul S. Schweigert
bb11c9d24f
update critools to v1.24
Signed-off-by: Paul S. Schweigert <paulschw@us.ibm.com>
2022-05-06 13:28:41 -04:00
Mike Brown
459179360a
Merge pull request #6900 from mikebrow/fix-for-empty-report-dir
move report dir option to end of line for vagrant cri tests
2022-05-05 18:32:16 -05:00
Mike Brown
8a2e8cd8de move report dir option to eol
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2022-05-05 22:21:51 +00:00
Akihiro Suda
1acd56e927
Merge pull request #6892 from dmcgowan/kubernetes-release-table
Update Kubernetes version matrix in release docs
2022-05-05 23:37:45 +09:00
Derek McGowan
af24e3871a
Update Kubernetes version matrix in release docs
Allow specifying specific versions of containerd for Kubernetes releases
and clarify recommendations and support policy.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-05-04 22:50:14 -07:00
Derek McGowan
885468815e
Merge pull request #6889 from kzys/pull-restart-test
Share container images between TestRestartMonitor and TestRestartMonitorWithOnFailurePolicy
2022-05-04 10:35:39 -07:00
Kazuyoshi Kato
7a834516f6 Share images between TestRestartMonitor and TestRestartMonitorWithOnFailurePolicy
These tests are launching containerd and pulling busybox there, while
other tests are using busybox from TestMain().

This commit shares busybox at least between TestRestartMonitor and
TestRestartMonitorWithOnFailurePolicy to reduce the chance of
throttling from ghcr.io.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-05-04 16:50:19 +00:00
Derek McGowan
e7b6f2fb2e
Merge pull request #6890 from mikebrow/update-readme-for-k8s-info
containerd 1.6.4 k8s 1.24 readme announce
2022-05-03 22:13:26 -07:00
Mike Brown
cedb7d3bd7
containerd 1.6.4 k8s 1.24 readme announce
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2022-05-03 21:07:35 -07:00
Derek McGowan
6fda809e1b
Merge pull request #6866 from ambarve/cleanup_leaked_shim
Cleanup leaked shim process
2022-05-02 16:52:31 -07:00
Kazuyoshi Kato
2bfc2a587b
Merge pull request #6804 from dmcgowan/metadata-collectible-resources
Add collectible resources to metadata gc
2022-05-02 11:24:39 -07:00
Kazuyoshi Kato
da60996042
Merge pull request #6881 from my-git9/kubedocurl
Update k8 docurl in file
2022-05-02 10:12:10 -07:00
Kazuyoshi Kato
f3c1467407
Merge pull request #6882 from AkihiroSuda/riscv64
Support RISC-V 64
2022-05-02 09:44:32 -07:00
Phil Estes
f4575d269c
Merge pull request #6885 from austinvazquez/doc
docs: minor fixes in snapshots.Snapshotter comments
2022-05-02 17:33:20 +01:00
Derek McGowan
d8b336f24d
Merge pull request #6884 from AkihiroSuda/deprecate-schema1
Officially deprecate Schema 1
2022-05-02 09:17:57 -07:00
austinvazquez
57d2bce749 docs: minor fixes in snapshots.Snapshotter comments
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
2022-05-02 15:51:11 +00:00
Akihiro Suda
42584167b7
Officially deprecate Schema 1
Schema 1 has been substantially deprecated since circa. 2017 in favor of Schema 2 introduced in Docker 1.10 (Feb 2016)
and its successor OCI Image Spec v1, but we have not officially deprecated Schema 1.

One of the reasons was that Quay did not support Schema 2 so far, but it is reported that Quay has been
supporting Schema 2 since Feb 2020 (moby/buildkit issue 409).

This PR deprecates pulling Schema 1 images but the feature will not be removed before containerd 2.0.
Pushing Schema 1 images was never implemented in containerd (and its consumers such as BuildKit).

Docker/Moby already disabled pushing Schema 1 images in Docker 20.10 (moby/moby PR 41295),
but Docker/Moby has not yet disabled pulling Schema 1 as containerd has not yet deprecated Schema 1.
(See the comments in moby/moby PR 42300.)
Docker/Moby is expected to disable pulling Schema 1 images in future after this deprecation.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-05-02 19:08:38 +09:00
xin.li
55401ac9c0 Update k8 docurl in file
Signed-off-by: xin.li <xin.li@daocloud.io>
2022-05-01 12:13:16 +08:00
Akihiro Suda
d4127a9f26
CI: add riscv64 builds
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-05-01 03:29:58 +09:00
Akihiro Suda
0e56e4f9ff
release/Dockerfile: update Ubuntu to 22.04 for supporting riscv64
Also update xx to 1.1.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-05-01 03:12:38 +09:00
Akihiro Suda
4b412b8003
seccomp: support riscv64
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-05-01 02:52:55 +09:00
Derek McGowan
91ceda541b
Merge pull request #6880 from kzys/fix-cirrus-ci
Make Cirrus CI tests more stable
2022-04-29 17:21:23 -07:00
Kazuyoshi Kato
8160a3efc3 Reduce the number of the concurrent HTTP requests in TestUserNamespaces
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-29 22:51:39 +00:00
Kazuyoshi Kato
7183fc81d2 Skip TestImagePullWithConcurrencyLimit on Cirrus CI
This test tends to fail under Cirrus CI + Vagrant. Skipping for now
since running the test on GitHub Actions would be suffice.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-29 22:14:24 +00:00
Phil Estes
8ec0909bbe
Merge pull request #6875 from marosset/windows-installation-docs
docs: Adding windows installation steps to getting-started.md
2022-04-29 17:20:01 +01:00
Phil Estes
65627f568f
Merge pull request #6809 from jterry75/main
Add ctr support for CPUMax and CPUShares
2022-04-29 16:39:52 +01:00
Mike Brown
6b35307594
Merge pull request #5490 from askervin/5Bu_blockio
Support for cgroups blockio
2022-04-29 10:07:56 -05:00
Antti Kervinen
10576c298e cri: support blockio class in pod and container annotations
This patch adds support for a container annotation and two separate
pod annotations for controlling the blockio class of containers.

The container annotation can be used by a CRI client:
  "io.kubernetes.cri.blockio-class"

Pod annotations specify the blockio class in the K8s pod spec level:
  "blockio.resources.beta.kubernetes.io/pod"
  (pod-wide default for all containers within)

  "blockio.resources.beta.kubernetes.io/container.<container_name>"
  (container-specific overrides)

Correspondingly, this patch adds support for --blockio-class and
--blockio-config-file to ctr, too.

This implementation follows the resource class annotation pattern
introduced in RDT and merged in commit 893701220.

Signed-off-by: Antti Kervinen <antti.kervinen@intel.com>
2022-04-29 11:44:09 +03:00
Mark Rossetti
9b04d2fae2 docs: Adding windows installation steps to getting-started.md
Signed-off-by: Mark Rossetti <marosset@microsoft.com>
2022-04-28 13:46:17 -07:00
Justin Terry
227156dac6 Add ctr support for CPUMax and CPUShares
Adds CPU.Maximum and CPU.Shares support to the ctr
cmdline for testing

Signed-off-by: Justin Terry <jlterry@amazon.com>
2022-04-28 13:17:16 -07:00
Derek McGowan
bb8b134a17
Merge pull request #6871 from baek9/patch-1
Fix comment for metadata/db.go
2022-04-28 11:45:43 -07:00
Phil Estes
0f5d4ff0ff
Merge pull request #6867 from kzys/remove-gogo
Remove github.com/gogo/protobuf and github.com/golang/protobuf from containerd's direct dependencies
2022-04-28 15:34:11 +01:00
Taeho Nam
b5370b0406
Fix comment for metadata/db.go
Fix comment

Signed-off-by: Taeho Nam <thn7440@gmail.com>
2022-04-28 13:32:45 +09:00
Mike Brown
3437ba7574
Merge pull request #6868 from MikeZappa87/issue/update-go-cni
Update go-cni to v1.1.5
2022-04-27 19:03:51 -05:00
Michael Zappa
5d0730370d Update go-cni to v1.1.5
Signed-off-by: Michael Zappa <Michael.Zappa@stateless.net>
2022-04-27 16:27:10 -06:00
Kazuyoshi Kato
cb84b5a1d2
Merge pull request #6865 from log1cb0mb/bump-opencontainers/selinux-to-v1.10.1
Bump opencontainers/selinux from 1.10.0 to 1.10.1
2022-04-27 14:46:21 -07:00
Kazuyoshi Kato
180c7535d7 Upgrade protoc, protoc-gen-go and protoc-gen-go-grpc
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:36:04 +00:00
Kazuyoshi Kato
2c6760005c go mod tidy & go mod vendor
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:31:21 +00:00
Kazuyoshi Kato
29b9379560 make protos
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 21:31:16 +00:00
Kazuyoshi Kato
fcba486366 Remove gogo from .proto files
While gogo isn't actually used, it is still referenced from .proto files
and its corresponding Go package is imported from the auto-generated
files.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-04-27 20:27:55 +00:00
Phil Estes
2a358a4e11
Merge pull request #6864 from kzys/upgrade-proto-and-grpc
Upgrade google.golang.org/grpc and google.golang.org/protobuf
2022-04-27 21:21:17 +01:00
Phil Estes
6348a7bf1e
Merge pull request #6863 from kzys/cirrus-cache
Don't use "uname -a" as Cirrus CI's cache key
2022-04-27 21:18:45 +01:00