Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with containerd v1.6.18 #10

Open
wants to merge 204 commits into
base: CC-main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
204 commits
Select commit Hold shift + click to select a range
ed9d3dc
oci: WithDefaultUnixDevices(): remove tun/tap from the default devices
thaJeztah May 10, 2022
026ac1c
Merge pull request #7268 from thaJeztah/1.6_backport_no_tun
mxpv Aug 8, 2022
5c230ec
Fix cleanup in critest
mxpv Jul 29, 2022
9ff7280
Merge pull request #7274 from mxpv/critest
samuelkarp Aug 9, 2022
0448673
Do not append []string{""} to command to preserve Docker compatibility
zuzzas Mar 29, 2021
1efd8b9
ci: remove GOPROXY environment variable due to https://github.com/go-…
samuelkarp Aug 15, 2022
1be2cb3
Merge pull request #7298 from deckhouse/docker-compat-1.6
samuelkarp Aug 16, 2022
579a638
Merge pull request #7299 from samuelkarp/ci-workflow-goproxy/1.6
kzys Aug 16, 2022
3507d60
update runc binary to v1.1.4
AkihiroSuda Aug 25, 2022
de1a190
Merge pull request #7333 from thaJeztah/1.6_backport_runc
kzys Aug 26, 2022
5b44c52
vendor: golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
thaJeztah Mar 17, 2022
23d2278
Merge pull request #7340 from dcermak/backport-golang-x-crypto-vendor
kzys Aug 30, 2022
d3c7e31
Update CRI-API
ruiwen-zhao Aug 10, 2022
ae85986
ContainerStatus to return container resources
ruiwen-zhao Aug 10, 2022
6ee5bb7
bump cri-api
zouyee Aug 25, 2022
fb753e5
update intergration
zouyee Aug 25, 2022
462caf1
Merge pull request #7410 from ruiwen-zhao/container_resource_1.6
mxpv Sep 22, 2022
0f7e258
Set grpc code for unimplemented cri-api methods
ruiwen-zhao Sep 22, 2022
3228848
Merge pull request #7421 from ruiwen-zhao/release-1.6-grpc
dmcgowan Sep 22, 2022
6b30bc4
.zuul: remove the zuul because it is offline
fuweid Sep 5, 2022
b720be2
remove stray .zuul.yaml
BenTheElder Sep 22, 2022
bf1b93e
Merge pull request #7427 from fuweid/16-cp-7369-7416
fuweid Sep 25, 2022
89e4960
remotes/docker/config: Skipping TLS verification for localhost
Iceber Sep 13, 2022
7b93a22
Merge pull request #7438 from Iceber/skip_verify_1.6
fuweid Sep 27, 2022
2fdfd56
make xattr EPERM non-fatal in createTarFile
junnplus Jun 22, 2022
2cbb524
Merge pull request #7447 from estesp/cp-7094-1.6
mxpv Sep 29, 2022
cb935bf
pkg/failpoint: init failpoint package
fuweid Jun 16, 2022
3e2e778
runtime/v2: manager supports server interceptor
fuweid Jun 16, 2022
71ee7de
bin/ctr,integration: new runc-shim with failpoint
fuweid Jun 18, 2022
4a5bc05
runtime/v2/shim: return if error in load plugin
fuweid Jun 18, 2022
07c4794
pkg/failpoint: add DelegatedEval API
fuweid Jun 19, 2022
a7f956d
integration: CNI bridge wrapper with failpoint
fuweid Jun 19, 2022
b0ce296
integration: Add injected failpoint testing for RunPodSandbox
fuweid Jun 19, 2022
d89a8d2
pkg/failpoint: add FreeBSD link and update pkg doc
fuweid Jun 23, 2022
a85709c
integration: simplify CNI-fp and add README.md
fuweid Jul 21, 2022
6338ef8
Merge pull request #7455 from qiutongs/backport-failpoint-1.6
samuelkarp Sep 30, 2022
1f29fac
Persist container and sandbox if resource cleanup fails, like teardow…
qiutongs Sep 16, 2022
b9a35c6
Add integration tests with failpoint
qiutongs Sep 27, 2022
926b9c7
retry request on writer reset
akhilerm May 13, 2022
a91dd67
Merge pull request #7456 from qiutongs/backport-ip-leakage-1.6
samuelkarp Oct 2, 2022
7b8d679
[release/1.6] integration: remove use of deprecated io/ioutil
thaJeztah Oct 4, 2022
4dc932e
[release/1.6] gofmt with go1.19
thaJeztah Oct 4, 2022
7db9d1f
Fix linter warnings
mxpv Jul 15, 2022
0aeeb62
[release/1.6] update golangci-lint to v1.19.0
thaJeztah Oct 4, 2022
28324c5
[release/1.6] Update go 1.18.7, addresses CVE-2022-2879, CVE-2022-288…
thaJeztah Oct 4, 2022
6496ac6
Merge pull request #7461 from akhilerm/cherry-pick-6995-1.6
samuelkarp Oct 5, 2022
1eb637f
Merge pull request #7475 from thaJeztah/1.6_bump_go_1.18.7
AkihiroSuda Oct 5, 2022
06f82ef
archive: validate digests before use
samuelkarp Oct 7, 2022
d9e2ba2
Merge pull request #7490 from samuelkarp/archive-dgst-validate/1.6
fuweid Oct 7, 2022
f2376e6
Update container with sandbox metadata after NetNS is created
qiutongs Oct 5, 2022
dccb152
Merge pull request #7505 from qiutongs/backport-netns-1.6
samuelkarp Oct 11, 2022
5b40993
[release/1.6] upgrade containerd/continuity from v0.2.2 to v0.3.0
kzys Oct 12, 2022
6afbeac
Merge pull request #7518 from kzys/backport/1.6/continuity-fix
mxpv Oct 13, 2022
b66eb72
migrate from k8s.gcr.io to registry.k8s.io
pacoxu Jun 9, 2022
a9adc79
cri: PodSandboxStatus should tolerate missing task
samuelkarp Oct 14, 2022
74e9e4c
Merge pull request #7549 from SergeyKanzhelev/switchToRegistry
AkihiroSuda Oct 18, 2022
8a9d693
[release/1.6] Stats() shouldn't assume s.container is non-nil
kzys Oct 12, 2022
9edb143
Merge pull request #7551 from samuelkarp/ip-leakage-flake/1.6
kzys Oct 18, 2022
9a194f7
Merge pull request #7557 from kzys/backport/1.6/stats-nil
estesp Oct 18, 2022
29e2dea
fix pusher concurrent close channel
lengrongfu Oct 4, 2022
8658d0b
Merge pull request #7562 from dcantah/cp-concurrent-closech
estesp Oct 20, 2022
a956d84
Add logging volume metrics to Containerd CRI plugin
sophieliu15 Oct 19, 2022
8b9c35a
Merge pull request #7571 from sophieliu15/release/1.6
samuelkarp Oct 21, 2022
99578d1
Update mailmap
samuelkarp Oct 21, 2022
346412f
adding support of CAP_BPF and CAP_PERFMON
henry118 Aug 16, 2022
f1493f6
Prepare release notes for v1.6.9
samuelkarp Oct 21, 2022
96929a5
Merge pull request #7574 from swagatbora90/backport-cap-bpf-perfmon
dmcgowan Oct 24, 2022
1c90a44
Merge pull request #7573 from samuelkarp/release/1.6.9
dmcgowan Oct 24, 2022
4907b4d
Migrate away from GitHub actions set-output
austinvazquez Oct 24, 2022
8813c6b
Merge pull request #7582 from austinvazquez/cherry-pick-be3987a92d6e5…
kzys Oct 26, 2022
658490b
ctr import: strictly match platform
ginglis13 May 6, 2022
de37b70
Merge pull request #7594 from ginglis13/cherry-pick-6906-match-plator…
AkihiroSuda Oct 28, 2022
df73aca
[release/1.6] go.mod: Bump hcsshim to v0.9.5
katiewasnothere Oct 31, 2022
a865cb5
Merge pull request #7610 from katiewasnothere/kabaldau/1.6-hcsshim-v0…
kevpar Nov 1, 2022
3f9f950
ctr export strictly match default platform
turan18 Nov 1, 2022
10841d6
Merge pull request #7627 from turan18/backport-ctr-export-strict
estesp Nov 5, 2022
303f608
[release/1.6] update to Go 1.18.8 to address CVE-2022-41716
thaJeztah Nov 5, 2022
f69fbac
Merge pull request #7634 from thaJeztah/1.6_bump_go1.18.8
AkihiroSuda Nov 7, 2022
5af8d89
overlayutils: Add fastpath for userxattr check
dcantah Nov 1, 2022
6c41694
Merge pull request #7646 from dcantah/cp-userxattr-1.6
kzys Nov 9, 2022
e639ecd
Prepare release notes for v1.6.10
dcantah Nov 12, 2022
770bd01
Merge pull request #7664 from dcantah/release-notes-1.6.10
dmcgowan Nov 14, 2022
8ec051a
[release/1.6] go.mod: use golang_protobuf_extensions v1.0.4
thaJeztah Nov 25, 2022
964b57b
Merge pull request #7723 from thaJeztah/1.6_protobuf_extensions_fix
estesp Nov 29, 2022
56593cc
cri: add pod uid annotation
mqasimsarfraz Nov 18, 2022
3b580ad
Merge pull request #7735 from inspektor-gadget/stable-add-sandbox-uid…
mxpv Nov 29, 2022
9fdf713
Added nullptr checks to pkg/cri/server and sbserver
Nov 24, 2022
3efc787
Merge pull request #7737 from kiashok/PortNullPtrCheck
dmcgowan Nov 30, 2022
15b5412
Fix order of operations when setting lease labels
austinvazquez Nov 19, 2022
92ee926
Merge pull request #7745 from austinvazquez/cherry-pick-c4dee237f57a7…
fuweid Dec 1, 2022
bb96b21
fix: support simultaneous create diff for same parent snapshot
cosmoer Jul 23, 2022
864cce9
Merge pull request #7756 from vvoland/rootfs-diff-multiple
fuweid Dec 6, 2022
3d24d97
Prepare release notes for v1.6.11
dmcgowan Dec 1, 2022
d986545
Merge pull request #7760 from dmcgowan/prepare-1.6.11
dmcgowan Dec 6, 2022
9743dba
[release/1.6] update to go1.18.9
thaJeztah Dec 6, 2022
52a4492
Merge pull request #7766 from thaJeztah/1.6_update_go_1.18.9
estesp Dec 7, 2022
ec5acd4
CRI stream server: Fix goroutine leak in Exec
dcantah Nov 28, 2022
1899ebc
Prepare release notes for v1.6.12
dmcgowan Dec 1, 2022
a05d175
Merge pull request from GHSA-2qjp-425j-52j9
dmcgowan Dec 7, 2022
3595dd0
fix: check for tmpfs when evaluating if userxattr should be used
mathis-m Dec 7, 2022
ccfc27e
Merge pull request #7788 from AkihiroSuda/cherrypick-7772
estesp Dec 9, 2022
206f987
fix pool_device_test.go
shnmorimoto Apr 14, 2022
c791229
Rework permission handling in scripts
mxpv Aug 6, 2022
69fd029
Use global env variable to specify Go version on CI
mxpv Aug 4, 2022
7e62ec1
CI: update GHA instances from Ubuntu 18.04 to 20.04
AkihiroSuda Oct 7, 2022
02076e5
Move up actions versions to prep for deprecation
estesp Oct 12, 2022
64a4228
Upgrade actions/upload-artifact from v2 to v3
kzys Oct 14, 2022
b52df34
update codeql-action to v2
akhilerm Oct 21, 2022
ffc16f5
Bump hcsshim to v0.9.6
Dec 13, 2022
b153017
Merge pull request #7713 from austinvazquez/cherry-pick-github-action…
kzys Dec 13, 2022
e59b84b
Merge pull request #7808 from kiashok/updateShimTag-release1.6
dmcgowan Dec 13, 2022
be6ef22
cri: make swapping disabled with memory limit
mqasimsarfraz Dec 7, 2022
64fa4a0
Merge pull request #7815 from inspektor-gadget/release/1.6
estesp Dec 14, 2022
d659a4f
allow client to remove created tasks with PID 0
ginglis13 Dec 8, 2022
0e8f5e2
fatal error: concurrent map iteration and map write
chaunceyjiang Dec 13, 2022
f7e578e
Merge pull request #7816 from ginglis13/backport-7787
dmcgowan Dec 14, 2022
c8889df
nil check to avoid panic on upgrade
mikebrow Dec 13, 2022
7d02c97
Merge pull request #7819 from dmcgowan/1.6-portfoward-concurrent-read…
dmcgowan Dec 14, 2022
34f7cec
Merge pull request #7820 from dmcgowan/1.6-nil-check-hugepagelimits
dmcgowan Dec 14, 2022
e260e8a
Prepare release notes for v1.6.13
dmcgowan Dec 14, 2022
1a5e26e
support fetching containerd from non public GCS buckets
akhilerm Nov 25, 2022
bd7db85
disable tracing while handling token
akhilerm Dec 8, 2022
b56901d
Merge pull request #7823 from akhilerm/cherry-pick-7771-1.6
dmcgowan Dec 15, 2022
78f5177
Merge pull request #7821 from dmcgowan/prepare-1.6.13
dmcgowan Dec 15, 2022
e8b22c1
Revert "[release/1.6] support fetching containerd from non public GCS…
akhilerm Dec 16, 2022
07b839d
Merge pull request #7830 from akhilerm/revert-7823-cherry-pick-7771-1.6
kzys Dec 16, 2022
1347d7c
Prepare release notes for v1.6.14
dmcgowan Dec 19, 2022
53c733e
cri: fix `memory.memsw.limit_in_bytes: no such file or directory`
AkihiroSuda Dec 19, 2022
5227354
Merge pull request #7838 from dmcgowan/1.6-fix-memory-swap-regression
dmcgowan Dec 19, 2022
9ba4b25
Merge pull request #7841 from dmcgowan/prepare-1.6.14
dmcgowan Dec 19, 2022
f16447e
CRI: Fix no CNI info for pod sandbox on restart
dcantah Dec 20, 2022
686c3f3
Merge pull request #7848 from dcantah/fix-noip-1.6
dmcgowan Dec 20, 2022
0f4062c
integration/images: switch away from Docker Hub to avoid rate limit
AkihiroSuda Jan 1, 2023
f28bb76
Merge pull request #7900 from dmcgowan/backport-1.6-integration-tests…
fuweid Jan 3, 2023
b573670
CI: Pass GITHUB_TOKEN to containerd/project-checks
kevpar Jan 3, 2023
ba6af25
Merge pull request #7919 from dmcgowan/backport-1.6-gh-rate-limit
samuelkarp Jan 4, 2023
883899e
Prepare release notes for v1.6.15
dmcgowan Jan 4, 2023
5b842e5
Merge pull request #7924 from dmcgowan/prepare-1.6.15
dmcgowan Jan 5, 2023
545f220
mod: update github.com/pelletier/[email protected]
samuelkarp Jan 6, 2023
cf13b64
Merge pull request #7942 from samuelkarp/upgrade-go-toml-1.6
AkihiroSuda Jan 10, 2023
1584c25
pushWriter: correctly propagate errors
jedevc Jan 24, 2023
d0dc798
release/Dockerfile: set DEBIAN_FRONTEND=noninteractive
AkihiroSuda Jan 17, 2023
6a8a653
[release/1.6] update to go1.18.10
thaJeztah Jan 24, 2023
e6cf5ec
Fix slice append error
liubin Nov 11, 2022
91d5e53
Vagrantfile: dump containerd log after critest
fuweid Aug 7, 2022
edfac18
fix install cni script
lengrongfu Oct 6, 2022
556bb0c
Vagrantfile: explicitly specify rsync as the shared folder driver
AkihiroSuda Oct 16, 2022
2c32f85
CI: update Fedora to 37
AkihiroSuda Nov 18, 2022
550424f
Vagrantfile: install-rootless-podman: remove `setenforce 0`
AkihiroSuda Jan 1, 2023
8009948
Vagrantfile: fix comments about SELinux
AkihiroSuda Jan 3, 2023
8b8a21f
Harden GITHUB_TOKEN permissions
cji Nov 1, 2022
5594f70
Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts
AkihiroSuda Jan 2, 2023
1709cfe
Merge pull request #7990 from thaJeztah/1.6_backport_fix_push_error_p…
dmcgowan Jan 24, 2023
91a68ed
cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
mqasimsarfraz Jan 10, 2023
4ca63a1
Merge pull request #7991 from thaJeztah/1.6_backport_release_debian_f…
estesp Jan 24, 2023
d22919a
seccomp: seccomp: add syscalls related to PKU in default policy
thaJeztah Jul 13, 2022
7037f53
seccomp: add get_mempolicy, mbind, set_mempolicy, with CAP_SYS_NICE
thaJeztah Jul 14, 2022
8c70403
Fix tx closed error when upperdirlabel specified
cardyok May 23, 2022
ab193eb
pkg/cri: optimize slice initialization
thaJeztah Jan 24, 2023
687d64b
Merge pull request #7992 from thaJeztah/1.6_update_go_1.18.10
dmcgowan Jan 24, 2023
2a9ef3f
Merge pull request #7995 from thaJeztah/1.6_backport_fix_vec_alloc
AkihiroSuda Jan 25, 2023
9421657
Merge pull request #7996 from thaJeztah/1.6_vagrant_backports
AkihiroSuda Jan 25, 2023
2dea8bf
Merge pull request #7999 from thaJeztah/1.6_backport_hardenperms
samuelkarp Jan 25, 2023
c6336f5
Merge pull request #8001 from thaJeztah/1.6_backport_seccomp_updates
samuelkarp Jan 25, 2023
8511d43
Merge pull request #8000 from thaJeztah/1.6_backport_test_fixes
samuelkarp Jan 25, 2023
394f5ee
Merge pull request #8002 from thaJeztah/1.6_backport_fix_tx_closed
estesp Jan 25, 2023
d3c595a
Prepare release notes for v1.6.16
dmcgowan Jan 28, 2023
6c6cc5e
add network plugin metrics
aojea Dec 22, 2022
31aa435
Merge pull request #8016 from dmcgowan/prepare-v1.6.16
dmcgowan Jan 28, 2023
84000cd
Merge pull request #8018 from aojea/backport_metrics
fuweid Jan 29, 2023
ae02a24
cri: mkdir /etc/cni with 0755, not 0700
AkihiroSuda Jan 28, 2023
4335c65
Merge pull request #8030 from AkihiroSuda/cherrypick-8020-1.6
estesp Jan 30, 2023
a6544ed
Export remote snapshotter label handler
ktock Jan 31, 2023
87acecd
Update hosts doc
jess-sol Nov 3, 2022
1436641
Support default hosts.toml configuration
jess-sol Nov 3, 2022
84936fd
importer: stream oci-layout and manifest.json
samuelkarp Jan 13, 2023
4a77dc8
Merge pull request #8054 from thaJeztah/1.6_backport_remotesnlabel
AkihiroSuda Feb 8, 2023
839086b
Merge pull request #8065 from cpuguy83/1.6_default_hosts
dmcgowan Feb 8, 2023
a1aa9b9
Prepare release notes for v1.6.17
dmcgowan Feb 10, 2023
0a06c28
add WithAppendAdditionalGroups helper
junnplus Jun 17, 2022
b45e302
add WithAdditionalGIDs test
junnplus Jun 17, 2022
16d52de
refactor: reduce duplicate code
junnplus Jun 24, 2022
0070ab7
oci: skip checking gid for WithAppendAdditionalGroups
junnplus Aug 5, 2022
3018234
oci: fix loop iterator aliasing
AkihiroSuda Jan 14, 2023
286a01f
oci: fix additional GIDs
AkihiroSuda Dec 24, 2022
664a938
CI: skip some jobs when `repo != containerd/containerd`
AkihiroSuda Feb 10, 2023
299b677
Merge pull request #8080 from dmcgowan/prepare-v1.6.17
dmcgowan Feb 10, 2023
c553746
Merge pull request #8083 from AkihiroSuda/ci-skip-on-fork-1.6
estesp Feb 10, 2023
3a0a35b
Revert "Don't check for apparmor_parser to be present"
neersighted Feb 10, 2023
624ff63
pkg/apparmor: clarify Godoc
neersighted Feb 10, 2023
d528415
Fix retry logic within devmapper device deactivation
swagatbora90 Feb 9, 2023
29cfda4
Merge pull request #8087 from neersighted/apparmor_parser_regression_1.6
fuweid Feb 11, 2023
c548ab7
Merge pull request #8088 from swagatbora90/backport-1.6
samuelkarp Feb 11, 2023
2b4b35a
ctr/run: flags --detach and --rm cannot be specified together
Iceber Jan 6, 2023
4d724f6
Merge pull request #8094 from Iceber/ctr_run_1.6
samuelkarp Feb 13, 2023
b327af6
Add fallback for windows platforms without osversion
cpuguy83 Feb 13, 2023
54ead5b
Go 1.19.6
AkihiroSuda Feb 15, 2023
47f1aad
Merge pull request #8111 from AkihiroSuda/cherrypick-8109-1.6
fuweid Feb 15, 2023
9cec7a8
Merge pull request #8106 from cpuguy83/1.6_loosen_windows_platform_ma…
kzys Feb 15, 2023
0c31490
Merge pull request from GHSA-259w-8hf6-59c2
dmcgowan Feb 15, 2023
133f6bb
Merge pull request from GHSA-hmfx-3pcx-653p
dmcgowan Feb 15, 2023
44e61d7
Add release notes for v1.6.18
dmcgowan Feb 15, 2023
2456e98
Merge pull request #8118 from dmcgowan/prepare-v1.6.18
dmcgowan Feb 15, 2023
b518604
Merge tag 'v1.6.18' into branch 'CC-main
jepio Feb 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 6 additions & 4 deletions .github/workflows/build-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
default: westeurope

permissions:
packages: write
contents: read

env:
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUB_ID }}
Expand All @@ -30,18 +30,20 @@ env:

jobs:
images:
permissions:
packages: write
name: "Build volume test images"
runs-on: ubuntu-latest
defaults:
run:
working-directory: src/github.com/containerd/containerd

steps:
- uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: '1.17.13'
go-version: '1.19.6'

- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: src/github.com/containerd/containerd

Expand Down
Loading