Skip to content

Commit

Permalink
containerd: update to 1.7.0-beta
Browse files Browse the repository at this point in the history
Bumping containerd to version v1.7.0-beta.0-284-gf2cf411b7, which comprises the following commits:

    d5010a12d docs: Authorizer.Authorize could return ErrUnexpectedStatus
    2eabcf702 fix: check for tmpfs when evaluating if userxattr should be used
    a6929f9f6 Add Evented PLEG support to sandbox server
    a338abc90 Add container event support to containerd
    e14753fc5 Respect no_cri constraint
    3bc8fc4d3 Cleanup build constraints
    c040f8382 Fix default config for Darwin
    0b349428e CI: Vagrant: pin rockylinux/8 to v5.0.0
    662d8a085 vendor: golang.org/x/net v0.4.0
    f9295aa49 Fix context when waiting sandbox
    8ab1d4496 Pass runtime configuration as TOML blob
    3e92dedc2 Update runtime options to include bytes blob
    a113737cc sbserver bug fixing
    85776d2c6 update to go1.19.4, go1.18.9
    840a657eb Change PushContent to require only Provider
    847294679 Adding unit tests to opentelemetry tracing
    8a25fa584 Unwrap proto errors in streaming client
    b0dd50655 fix panic when containerd-stress density --count 0
    39cc684c6 docs: Add extra security instructions
    afa19a0a7 Fix process_vm_* syscall names in seccomp
    740e90177 go.mod: re-vendor NRI from the official repo.
    345332175 upgrade the ops.md output for current 1.7 version .
    f88162587 Rename transferer to transferrer
    fc2754204 Cleanup code comments and lint fixes
    f1598cf5e Update transfer docs
    01bd314b1 Rename local transfer plugin
    c387a5205 Add variables names to transfer interface
    8304a61b5 Combine stream fuzz tests
    0762a3a75 Add media type to export stream
    52341a234 Update export API types
    42eedc0bc Update ctr to make local the default for distribution
    ef61e13a6 Update import cli to use transfer service
    11c1c8e6f Update import logic
    66dc4d106 Update API for import types
    b991c71e9 Update pull command to use filter arguments
    40d3fa3af Add filter fields to image store types
    9ae92f16e Improve push handler ordering
    737257bb4 Add push progress
    e88baa087 Fixup pull authorization and labeling
    478f1c934 Lint fixes
    28ea75456 Regenerated protobuf files with updated version
    b0f519703 Add transfer docs
    cd67a98ec Add transfer integration test
    0aca4bb1f Update ctr commands to use transfer interface
    6b5df1ee1 Update transfer packages
    2a8d7a744 Update transfer API
    7318a2def Add transfer plugin registration
    d1627e3c7 Add basic import and export handlers
    adfaeeff0 Add binary stream functionality and helpers
    e506cd103 Implement client interface for transfer service
    81afd9c36 Add progress
    0e4e96544 Add transfer proxy client
    6f64cb859 Transfer interface and plugin work in progress
    f61ed7e94 Transfer API types
    a24ea31c2 Add transfer API
    dcf5687ca Add streaming service
    08d5879f3 Added nullptr checks to pkg/cri/server and sbserver
    8e0a3c51a Add ctr image prune
    ceab73007 use MaxConcurrentDownloads instead of MaxConcurrentUploadedLayers
    f012617ed CRI stream server: Fix goroutine leak in Exec
    9f4ba4883 [sandbox] Fix panic when waiting for sandbox controller
    dbc6d33ac [sandbox] Specify sandbox ID when using sandboxed shims
    9a53a6c34 [sandbox] Don't access pause container when creating pod container
    cc111eef6 [sandbox] Move sandbox info to podsandbox controller
    a0daf1c28 docs: add NRI-related documentation.
    02f0a8b50 pkg/cri/server: nuke old v0.1.0 NRI hooks.
    ca84aba6c integration: add first NRI integration tests.
    b27ef6f16 pkg/cri/server: experimental NRI integration for CRI.
    43704ca88 nri: add experimental NRI plugin.
    a6d1d53cc [sandbox] Update Controller.Status protos
    2136736f5 go.mod: golang_protobuf_extensions v1.0.4 - prevent incompatible versions
    63c6c55ab go.mod: roll back github.com/containerd/cgroups to v1.0.4 release
    3c1c0878e integration/client: update containerd version to v1.7.0-beta.0
    ebd63adac integration/client: fix go.mod grouping
    8d868dadb Add ptrace readby and tracedby to default AppArmor profile
    8c035d387 Resolve warnings in Windows GitHub Actions periodic workflows
    ae0da7dc5 Use sandbox store to retrieve runtime info for sandboxed containers
    3ddaa3444 Retrieve sandbox creation time from store.
    4b3281982 Remove duplicated helpers
    3f331e7d1 Specify runtime configuration for sandbox shims
    c4dee237f Fix order of operations when setting lease labels
    a22f0a4c3 archive: set WithModTimeUpperBound when WithSourceDateEpoch is set
    ed3a49c0e fix for OSS-Fuzz infra changes
    ac4af4df8 integration: enable CNI slow test for sbserver
    a74f7e902 sbserver: save netns in sandbox metadata on create
    085d8e633 integration: enable tests for sbserver
    1deaedd38 sbserver: persist sandbox during partial teardown
    5a7c108ba Resolve Scorecards GitHub Actions workflow warnings
    b7b185c92 update github.com/cpuguy83/go-md2man/v2 to v2.0.2
    6142a2a24 sys: remove unused GetOpenFds()
    f0ce2f6d3 remotes/docker: remove deprecated NewAuthorizer alias
    c71a31156 sys: remove aliases for deprecated EpollCreate1, EpollCtl, EpollWait
    3e5b444ac pkg/cri/util/: remove deprecated NormalizeImageRef alias
    3a7cfaebb sys: remove alias for deprecated sys.RunningInUserNS()
    bd912bbee go.mod: github.com/matttproud/golang_protobuf_extensions v1.0.2
    5f23daeb2 go.mod: github.com/moby/sys/sequential v0.5.0
    763ec7c86 go.mod: github.com/cpuguy83/go-md2man/v2 v2.0.2
    0f616e354 go.mod: github.com/AdaLogics/go-fuzz-headers v0.0.0-20221118232415-3345c89a7c72
    df4d07352 go.mod: golang.org/x/sys v0.2.0
    4e68634ef go.mod: github.com/sirupsen/logrus v1.9.0
    579c7f43d Change fsnotify event status condition.
    2cea525ee Bump fsnotify to v1.6.0
    73c6db881 Bump urfave-cli to v1.22.10
    bf777a70b remove duplicated tx rollback
    70b65062c Missed out `platform interface` when reused the conn for Client.
    0c4d32c13 cri: add pod uid annotation
    438db09b0 Fix building.md for btrfs
    792294ce0 Update to cri-api v0.26.0-beta.0
    234bf990d Copy cri-api v1alpha2 from v0.25.4 to containerd internal directory
    e224f77eb Add process_vm read and write calls to default seccomp profile
    e4130b2a0 overlay: Remove unused method param
    661aaae3b introspection: expose the daemon's PID and PIDNS
    f6232793b can set up the network serially by CNI plugins
    2f5dd7c66 CI: update Fedora to 37
    3fc5802d1 gotestsum match go version 1.19
    aaf59efd2 Expose Done and Err in Shutdown service
    5d0457df9 Refactored ctr to allow for tty allocation when container has {terminal:true} within Spec
    c245347e9 tx rollback when GetInfo return error
    14a08721c Remove OpenTelementry imports from remotes/docker package
    405024db0 complement sub-command note for containerd-main
    e38e2c8a4 make status more readable and update easy.
    3abcfb5c0 keep the lower case letter for flag info
    69af001b3 Replace broken and redirection link for CRI and kubelet in docs
    b0133882f bump critools into ca1571e6edd116b2c95f52e3dfa0b4779b74223a
    8bb599973 Remove the outdated comment
    dd86128e0 Convert hcsshim's stats to cgroups' stats
    6596a7086 Use github.com/containerd/cgroups/v3 to remove gogo
    38ad785ce Bump k8s.io deps to v0.25.4
    bd66f588b Bump OpenTelemetry contrib to v0.36.4
    3fca677c1 Release: add static binaries
    0c63c42f8 Fix slice append error
    b829e6f2d Bump OpenTelemetry to v1.11.1
    7def13dde Add a thin wrapper around otel Span object
    ab194e65f Bump grpc to v1.50.1
    b742aa2e7 fuzzing: bump go-fuzz-headers
    91e295d76 Add `--debug` args
    0f54c4740 feat add sandbox api status func
    c953eecb7 Sandbox API: Add a new mode config for sandbox controller impls
    99ac7a771 add oci.WithCPURT
    717aa5929 Remove uses of deprecated go-digest.NewDigestFromHex, go-digest.Digest.Hex
    3a9044f24 Rename darwin-kubelet to containerd
    5f48e00af Extra documentation for content interfaces.
    202abf8fc Bump k8s.io deps to v0.25.3
    eaedadbed replace strings.Split(N) for strings.Cut() or alternatives
    f90219d47 services/server/config: TestMergeConfigs(): use correctly formatted values
    4866d8ba4 registry: support ipv6 addresses
    8bec2b652 Replace references to `re` with `regexp.MustCompile`
    5c510e47a Improve how reference regexps are built
    98ff27265 Clarify repo name regex intention
    2a8a53178 go.mod: change imports to github.com/distribution/distribution/v3
    a97eb6955 Update repo normalize error message to include the name of the repo.
    b979f0069 Fix bug in parsing domain from repository reference
    f96660286 reference/docker: add unit-tests from upstream distribution/distribution
    7de88c5ba reference/docker: align files with original code
    f32595a0c Fix "getCPUInfo for OS freebsd: not implemented" on FreeBSD/arm64
    11a06c1a3 ctr: add `ctr content fetch-blob`
    dfd6a3aa6 remotes: add FetcherByDigest for fetching blobs without foreknown descriptors
    c607f83c3 Fix missing closed fifo
    a24ef0993 Replace mount fork hack with CLONE_FS
    8b1b81eef Update hosts doc
    f0bf9e7f8 Support default hosts.toml configuration
    81bbd9dac add option to resolve symlinks to linux device
    ee64926a7 add SpanAttribute
    2d9f0f2fb add additional info in backport process
    3b87d46ce Add tracing spans in CRI image service and pull.go
    902b96cf2 fix comments
    30c3078ae go.mod: golang.org/x/*: use tagged versions
    422a24066 Bump go version to 1.19.3
    9c2a63440 Fix ctr crash when pulling with http-trace and http-dump
    78ac0046a ctr export strictly match default platform
    a270d6e8a Harden GITHUB_TOKEN permissions
    98269c061 s390x: initial enabler
    4b2a23e7e overlayutils: Add fastpath for userxattr check
    2da782468 Add sequence diagram for shim runtime v2
    0be981595 Sandbox API: Move remote impls to /sandbox/proxy
    2e83d885d fuzzing: improve archive fuzzer
    7c77b3540 Add Workflow for running critest with Hyper-V Containers on Windows.
    9494f0b80 Add HyperV config in tests
    53f67705c Add release notes for v1.7.0-beta.0
    c776a3631 Update mailmap
    b7d0d1271 Cleanup sandbox interfaces
    be3987a92 Migrate away from GitHub actions set-output
    9a0331c47 maintenance: Remove WithWindowsNetworkNamespace from pkg/cri
    3f3e2b3cc Fix LogURI generation-related tests on Windows.
    ddb8a65be update codeql-action to v2
    727b33c71 Retry client connection in  waitForStart
    3e4449862 Add logging volume metrics to Containerd CRI plugin
    3ddcbf5f1 Update 1.5 release support timeframe
    9a8611d63 bump go-fuzz-headers
    fc86be501 not init a tracing processor when not loaded
    47fa603e1 Update required Go version in BUILDING.md
    8e7ef890a Use logtest if possible to clean up logs
    a76d68ee4 Separate containerd logs in GitHub Actions' console
    e47bdbd16 Upgrade critools from 1.24.1 to 1.25.0
    878dbc7af Upgrade actions/upload-artifact from v2 to v3
    198277202 Use `go env` to determine GOPATH in Makefile.
    6a07a1c07 go.mod: matttproud/golang_protobuf_extensions v1.0.2 (use tag)
    972399538 sys: synchronize mkdirall() with latest os.MkDirAll()
    063c5f980 sys: create SecurityAttribute only once (Windows)
    a983599e2 sys: update volumePath regex to allow returning earlier
    d422c87e4 sys: compile volume-path regex once, and update GoDoc
    f8f052482 Vagrantfile: explicitly specify rsync as the shared folder driver
    4839f1bdf Add timeouts to all CI jobs
    890398677 cri: PodSandboxStatus should tolerate missing task
    fb6a40dc9 Don't unmount on Darwin when deleting bundle
    c7e6a889b sys: remove unused IsAbs() (windows)
    48daccb4d fix the --no-pivot flag being ignored by `ctr tasks start`
    ea53e52fc CI: update GHA instances from Ubuntu 18.04 to 20.04
    49a54e23c Stats() shouldn't assume s.container is non-nil
    e7c8a5ab0 Move up actions versions to prep for deprecation
    752bff981 cmd/containerd: use golang.org/x/sys/windows.SetStdHandle()
    8b5df7d34 update golangci-lint to v1.49.0
    f9c80be1b remove unneeded nolint-comments (nolintlint), disable deprecated linters
    29c7fc952 clean-up "nolint" comments, remove unused ones
    d21572513 pkg/cri/(server|sbserver): criService.getTLSConfig() add TODO to verify nolint
    0eaace306 golangci-lint: sort linters in config file
    3ebeb6d79 linting: address gosec G112/G114
    347397cf2 update go.mod and go.sum
    643dc1656 improve CDI logging
    8ed910c46 CDI: configure registry on start
    eec7a76ec move WithCDI to pkg/cri/opts
    634bf0dd3 cmd/containerd: use golang.org/x/sys Service.SetRecoveryActions()
    17a932403 Update the default seccomp to block socket calls to AF_VSOCK
    d4b9dade1 Updates oci image config to support upstream ArgsEscaped
    047e684bb fix install cni script
    b7f6a6804 runtime/v2/shim: clean up the use of containerdBinary
    b41d6f40b Update container with sandbox metadata after NetNS is created
    8fc68db0c cmd/containerd: replace deprecated windows.IsAnInteractiveSession()
    63a7d8a7f fix pusher concurrent close channel
    260af5e1d TestTaskResize must use a terminal
    39158629f diff/apply.readCounter: check negative size
    70fbedc21 archive: add WithSourceDateEpoch() for whiteouts
    0aefb5280 archive: windows: chtimes(): remove redundant conversion
    f9c9121e5 archive: validate digests before use
    8162e044b Add long term stable release branches
    e2d8f3859 vendor: github.com/opencontainers/selinux v1.10.2
    011fca6ed fuzzing: create structured tar bytes in archive fuzzer
    54f2b5121 Update to go 1.19.2 to address CVE-2022-2879, CVE-2022-2880, CVE-2022-41715
    f330ffd83 cri doc: Update kata containers reference
    0119d43a4 use raw link to containerd.servic config
    a59ecc50e CRI: implement Controller.Delete for SandboxAPI
    9d18b5746 Modify WithDiscardUnpackedLayers
    4333e6a6d Swap to net.ErrClosed checks for services
    acb2964d6 go.mod: Bump go-winio to v0.6.0
    4196fad02 Add integration tests with failpoint
    4f4aad057 Persist container and sandbox if resource cleanup fails, like teardownPodNetwork
    396b6d670 fix missing close
    7a66f70b5 cri-integration: pass ENABLE_CRI_SANDBOXES to test
    2432b54a5 Add new ctr option for discarding unpacked layers
    b4558bedc Add test flag for skipping shim cgroup test
    c6f571fc7 Set grpc code for unimplemented cri-api methods
    82890dd29 CRI: implement Controller.Stop for SandboxAPI
    927906992 CRI: implement Controller.Wait for SandboxAPI
    dcb0d8f9e remove stray .zuul.yaml
    e22a7a383 reference CDI configuration details
    bc01f8fc0 Add reader option to local content reader at
    c8010b9cb sbserver: return resources in ContainerStatus
    b92f3160a cri-integration: propagate ENABLE_CRI_SANDBOXES
    b79dcabd6 chore: enable Scorecard Github Action
    8f4c23b69 retry request on writer reset
    a37c64b20 Refactor CRI fuzzers
    bf26140d9 Fix LogURIGenerator on Windows
    adfbda464 Add ext2 fs support to devmapper snapshotter
    f0fbc8dfd Upgrade fuzzing-related packages to reduce dependencies
    e7c593edd Fuzzing: Instrument with new sanitizers
    9cdf9f6c6 Use jq and only show failed tests on summary
    34ad96bab CI: Output a summary using GITHUB_SUMMARY
    524d3aca8 github.com/emicklei/go-restful CWE-285: Improper Authorization
    3cfde732e remotes/docker/config: Skipping TLS verification for localhost
    0f51aa874 Add NoSameOwner option when unpacking tars
    b2a7183a8 matching the casing of other flags for ctr's pull command.
    829dd2145 update cdi version to v0.5.1
    0f743ce4f vendor: golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
    8f2bbd5e8 Update to go 1.19.1, 1.18.6 to address CVE-2022-27664, CVE-2022-32190
    6ce0f6a26 Fix missing close
    8575a0d6f Remove unused variable from images action
    5e57d463d feature: use client default namespace
    3c0e6c40a feat: upgrade registry.k8s.io/pause version
    f9166aa53 .zuul: remove the zuul because it is offline
    e041d1a2c integration: TestUpdateContainerResources_MemoryLimit: remove TODO comment
    3a2197f5f metrics/cgroups/v1: Remove unused event parameter
    bfb280fb3 Update golangci-lint timeout to match config
    407703f09 Make checkContainerTimestamps less strict on Windows
    344b25995 delete redundent import alias and and type conversion
    17e436c20 Pin github.com/AdamKorcz/go-118-fuzz-build
    a3bfa58b0 Make oss-fuzz mandatory
    2e677c932 sys: move ForceRemoveAll to integration/client
    19db697a5 archive: replace tarName() with filepath.ToSlash()
    3cc3d8a56 mount: use ioctl helpers from x/sys/unix
    0c6553bfd go.mod, vendor: bump golang.org/x/sys to latest version
    93342d637 replace sys Sequential funcs with moby/sys/sequential
    9ae2cc3a8 mount: remove unused ErrNotImplementOnWindows
    dcfaa30ba chore: remove duplicate word in comments
    b170eb3ca Add Kubernetes v1.25 supported version as v1.24
    fdff11def ctr: add privileged-without-host-devices for run command
    d063597e8 Upgrade github.com/klauspost/compress from v1.11.13 to v1.15.9
    eb664aed0 go.mod: github.com/opencontainers/runc v1.1.4
    ad597015c update runc binary to v1.1.4
    962841fc7 Clarify containerd 1.5.0+ for k8s 1.20,1.21
    90f6bd21c script/setup: handle cnidir with SUDO
    331066f87 update intergration
    49e2fe2ab bump cri-api
    b7b1200dd ContainerStatus to return container resources
    9525b3148 migrate from k8s.gcr.io to registry.k8s.io
    f0036cb9d windows: Add runhcs-wcow-hypervisor runtimeclass to the default config
    f318947b0 Do not rename test files on-the-fly to share functions
    912d43b2b Revert "Downgrade MinGW to version 10.2.0"
    850f667f5 contrib/fuzz/daemon.go: reformat the fileheader
    460b0533b pkg/cri/streaming: increase ReadHeaderTimeout
    9d286baed crypto/sha256 must be imported
    adc7d5b2e Don't patch github.com/cilium/ebpf
    470d3ee05 Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
    43907515b adding support of CAP_BPF and CAP_PERFMON
    13b14736a Don't fail test when GOOGLE_APPLICATION_CREDENTIALS is unset
    095044710 Remove Windows special case in TestContainerdRestart
    1f8db2467 go.mod: Bump hcsshim to v0.10.0-rc.1
    396d2a7e4 ci: remove GOPROXY environment variable due to go-yaml/yaml#887
    1d8b1bc75 Cleanup shim manager
    ff65fc2d0 Make TaskList generic
    6e4b6830f Update CRI-API
    782fd3c8e Vagrantfile: dump containerd log after critest
    74c09b756 Fix contrib/ header
    8add7e5d3 Rework permission handling in scripts
    6ba91de84 release workflow: remove Go setup action
    f8add9263 release workflow: increase timeout to 30 minutes
    2dbff1dbc oci: skip checking gid for WithAppendAdditionalGroups
    481861020 release: rollback Ubuntu to 18.04 (except for riscv64)
    68bae258a Update protobuf definitions
    ca3b9b50f Run gofmt 1.19
    4a11a4018 Update golangci-lint to 1.48 with Go 1.19 support
    ea6613029 Switch to Go 1.19
    7787168cc Use global env variable to specify Go version on CI
    5cf77fc43 Add TODOs for the remaining work
    e1c5d71c0 Update golang to 1.18.5, 1.17.13
    ee0f2e906 Change os.Stderr reassign for Windows service
    426fcfbc5 fix protobuf aarch64
    aa3303b69 Update sandbox protobuf to match CRI
    882322417 Update controller's start response to incldue pid and labels
    3d028308e Cleanup CRI files
    c085fac1e Move sandbox start behind controller
    f51014f8d Add sandbox to in memory services
    6c14ca25d Fix cleanup in critest
    e47c433d5 Add sandbox store helpers
    f5fb2c32d Regenerate protos with updated protoc-gen-go
    b16c3e9ad Windows HostProcess container CRI stats test
    106433b79 Use httputil.DumpRequestOut for dumping client req
    2fa84b1b8 Add extra context to error when push unauthorized
    f4d05f207 chore: bump macos runner version
    276a6f133 test: error strings should not be capitalized
    2b92c70fa Fix command line parsing for image list
    14003683f go.mod: Bump hcsshim to v0.9.4
    1e0698e8e Fix CRI image pull timeout test for ppc64le
    c15d8e156 go.mod: Bump hcsshim to 0.9.3
    a9514da75 Update image references for Windows tests
    2ae5f405d Use image lists instead of hardcoded images
    552d76344 Use image lists in client tests
    d121efc6d replace with selinux label
    e6a2c0790 integration: simplify CNI-fp and add README.md
    344431cdd fix: support simultaneous create diff for same parent snapshot
    050cd58ce Drop deprecated `ioutil`
    500ff95f0 Make getServicesOpts a helper
    ee6fc5c2e adds an env var commented out for sandboxed mode
    cbebeb944 pkg/failpoint: add FreeBSD link and update pkg doc
    3c5e80b63 integration: Add injected failpoint testing for RunPodSandbox
    be91a219c integration: CNI bridge wrapper with failpoint
    1ae6e8b07 pkg/failpoint: add DelegatedEval API
    b297775ea runtime/v2/shim: return if error in load plugin
    5f9b318e5 bin/ctr,integration: new runc-shim with failpoint
    822cc51d8 runtime/v2: manager supports server interceptor
    ffd59ba60 pkg/failpoint: init failpoint package
    3125f7e1a cri_stats: handle missing cpu stats
    7eeec8987 adds support for using env file for systemd boot
    7dc66eee6 using ContextDialer instead
    6639b2b02 test: Add ability to switch between  cgroupv1 or cgroupv2
    0d6881898 Refactor usageNanoCores be to used for all OSes
    f6bc986dc go.mod: github.com/stretchr/testify v1.8.0
    628f6ac68 code cleanup
    cc30880e8 ci: workaround Cirrus CI's INVALID_ARGUMENT
    d8d63a7aa docs: Fix sample config.toml syntax
    88bcbb036 adds a comment explaining how to disable experimental sbserver
    3a3f43f72 Fix linter warnings
    60f51c1aa Update and align golangci-lint version
    98a1b7ff1 Add log messages when choosing CRI server
    bbb8d3470 seccomp: add get_mempolicy, mbind, set_mempolicy, with CAP_SYS_NICE
    19e847983 seccomp: seccomp: add syscalls related to PKU in default policy
    2ba635331 Change metrics namespace for sandboxed CRI to prevent panic
    b8e93774c Enable integration tests against sandboxed CRI
    cf5df7e4a Fork CRI server package
    4ffef752d update golang to 1.18.4, 1.17.12
    c733119db cri doc: fix formatting for CDI options
    f77d45e3b ctr: support --user for run/create
    22dfc68ad Fix protobuf script to install protobuf on darwin
    bcdc8468f Fix out of date comments for CRI store packages
    174b01344 update some devmapper docs
    575095fcd seccomp: allow clock_settime64 when CAP_SYS_TIME is added
    e9e33f847 Copy fuzzers from github.com/cncf/cncf-fuzzing
    b31631859 Upgrade github.com/AdaLogics/go-fuzz-headers
    6d4b61007 integration/client: fix typo in export_test.go
    b8bb33b92 fix can't edit object by using ctr content edit command
    548c9c317 Fix WWW-Authenticate parsing
    b8403d2e1 Update k8s.io/cri-api to v0.25.0-alpha2
    a44cabf51 Update go-restful/v3 to latest release
    c2703c08c pkg/cri: use marshal wrapper for version convertor
    d2588b3fa LCOW differ return ErrNotImplemented for wrong mount type
    0a240ff81 Fix missing closed HTTP Body
    f7de1c8f9 Do not hardcode fuzzers
    2b60770c4 Move container_fuzzer.go under integration/client/
    66cc0fc87 Copy FuzzCRI from cncf/cncf-fuzzing
    ca5637104 Remove mainfuzz package and StartDaemonForFuzzing
    17f9c3a0e Move builtins_*.go to cmd/containerd/builtins to make the files reusable
    d97b754a5 Cleanup metadata tests
    1ef4bda43 Downgrade MinGW to version 10.2.0
    1ab42be15 refactor: reduce duplicate code
    47ad5f70e Fix Doc:
    fb5b6612a ctr: Fix `ctr c create` fails to parse arguments
    68a55fe8b make xattr EPERM non-fatal in createTarFile
    99e210c50 Move metadata plugin registration to seperate package
    4f0ea7831 fix: missing sudo for devmapper doc
    72b87ad00 add WithAdditionalGIDs test
    5bf705255 add WithAppendAdditionalGroups helper
    5cde04bc7 Forward ctr snapshotter flags on Windows
    4ac1031e0 Add snapshotter key to snapshot events
    b27a229df Move contrib/fuzz/docker_fuzzer.go to remotes/docker
    f91616e45 Copy FuzzConvertManifest from cncf/cncf-fuzzing
    c9c5fee37 Do not hardcode fuzzing targets
    50f1a4e42 Don't log "ignored xattr ..." warnings
    112497bc3 Make oss_fuzz_build.sh quiet
    6e53ffb10 ctr: add --hostname flag to create, run
    7002fc2c4 Ensure Windows Periodic workflow errors out while still uploading results.
    2e288f5b1 improve content-flow
    d4ab64988 Revert MinGW to oldest known working version in Windows setup script.
    55dd56e52 Make CI Fuzz optional
    82adbc849 Run fuzzing tests with go test -fuzz
    a1eb2d8a6 Use testing.F on FuzzPlatformsParse
    57200edf2 Use testing.F on FuzzParseProcPIDStatus
    0b3c31dd7 Downgrade MinGW in Windows setup scripts.
    42a386c81 CRI: change the /dev/shm mount options in Sandbox.
    a62a95789 CRI: remove default /dev/shm mount in Sandbox.
    8245e35eb Make test path a constant
    ee14f9316 Run fuzzers in CI
    52593cfc8 containerd-stress: add support for running through CRI
    5560b622d archive: Explicitly specify stdio for tar(1)
    95f1d7971 platforms: Run goimports for FreeBSD
    42e019e63 cri/server: Disable tests on FreeBSD
    ad8e59806 oci: Remove empty mount option slice for FreeBSD
    c15f0cdaf oci: FreeBSD devices may have major number 0
    2ab8c12fc archive: use Linkat on FreeBSD for hardlinks
    61690d76d Improve naming consistencies in comments in snapshotter.go
    c101f7999 Allow CRI on Darwin
    0167e55ab update runc binary to v1.1.3
    c3fb7dfa7 go.mod: github.com/moby/sys/mountinfo v0.6.2
    fa4720fa1 fix add ro mount for userattr-unmount unexpected timeout
    92d360b58 fix minor spelling mistake: lablel -> label
    6190b0f04 Correct spelling mistake ("sanbdox" to "sandbox")
    5a6e4144a go.mod: github.com/containerd/cgroups v1.0.4
    088c8df3a go.mod: github.com/containerd/continuity v0.3.0
    012d68ff9 add gc scheduler metrics: collection count
    44e12dc5d Windows snapshotter touch ups and new functionality
    40aa4f3f1 Implicitly discard the input to drain the reader
    00eb74a4c Make building static binaries simpler
    d25b4e6f3 Bump Golang and MinGW versions in Windows setup script.
    7b9f1d405 Added support for runtime level snapshotter, issue 6657
    8bc6ccc07 Bump k8s.io deps to v0.24.1
    5fcde823d Bump grpc to v1.47.0
    1b3c3860d update golang to 1.18.3, 1.17.11
    e3b4d750d update go-cni/for cni update fixing plugins that don't respond with version
    8ed54849a Move docker reference logic to reference/docker package
    f7aa90d27 Fix containerd-stress duration flag
    ae22854e2 Linux containers on FreeBSD
    49ca87d72 Limit the response size of ExecSync
    1cf6f2032 promote pause image to 3.7
    b5e1b8f61 Use t.Run for /pkg/cri tests
    b572a82ad CRI: Remove deprecated error types and update error msg
    978ff393d Add validations for Windows HostProcess CRI configs
    1a8024b46 Makefile: use urfave_cli_no_docs for binaries that don't need it
    5bb47fb95 vendor: github.com/urfave/cli v1.22.9
    a3a2d14ec fix verify-vendor if go.mod does not contain replace rules
    688b30cf5 CRI: Move truncindex to pkg
    e44335800 CRI: Move reference sorting to reference package
    b5366f8d7 CRI: Retrieve image spec on client
    4ba5415fb build: Fix references to check-protos target in Makefile
    8a3114b37 Fix broken oss-fuzz build
    d2f30150b archive: add human-readable hint to Lchown error
    9f9ebbd99 Fix tx closed error when upperdirlabel specified
    739cb4c99 config: improve config v1 deprecation message
    b5107a898 Fix Windows install powershell script
    b69182c71 add note that a namespace cannot be named "version"
    8d95f2b59 fix comments on metadata schema
    900019b30 ctr sandbox: handle sandbox config
    8ec1fc70d adjust format
    a42688639 Restore decompression benchmarks
    8494f7f11 adjust format in comment
    92b7bc9ed ctr: fix label args used in NewContainer
    4da4a8879 update doc url
    eaec6530d fix some confusing typos
    65150600d Separate windows-2019 and windows-2022 test results
    7300296cb reverts removal of parallel run from critest
    523d069a2 sandbox: replace github.com/pkg/errors with native errors
    c4ce13a28 vendor: github.com/opencontainers/runc v1.1.2
    25858d621 update runc binary to v1.1.2
    c1140aef6 Bump OpenTelemetry dependencies
    f710505f4 shim: fix debug flag not working
    72cd3b476 update golang to 1.18.2, 1.17.10
    f5b7a4b3d CI: update Fedora to 36
    a3ac15600 oci: WithDefaultUnixDevices(): remove tun/tap from the default devices
    ad8b87ba2 Add `Wait` to `binaryProcessor`
    d9fc5f4b0 Enable git commands due to git CVE fix
    09c2c2a75 Pass explicit JUnit outfile to critest.exe in Windows workflow.
    2c98a7b09 ctr import: strictly match platform
    d1c49781e go.mod: Bump k8s deps to v0.24.0
    c721c8e27 devmapper docs: small fixes
    bb11c9d24 update critools to v1.24
    8a2e8cd8d move report dir option to eol
    af24e3871 Update Kubernetes version matrix in release docs
    7a834516f Share images between TestRestartMonitor and TestRestartMonitorWithOnFailurePolicy
    cedb7d3bd containerd 1.6.4 k8s 1.24 readme announce
    57d2bce74 docs: minor fixes in snapshots.Snapshotter comments
    42584167b Officially deprecate Schema 1
    55401ac9c Update k8 docurl in file
    d4127a9f2 CI: add riscv64 builds
    0e56e4f9f release/Dockerfile: update Ubuntu to 22.04 for supporting riscv64
    4b412b800 seccomp: support riscv64
    8160a3efc Reduce the number of the concurrent HTTP requests in TestUserNamespaces
    7183fc81d Skip TestImagePullWithConcurrencyLimit on Cirrus CI
    10576c298 cri: support blockio class in pod and container annotations
    9b04d2fae docs: Adding windows installation steps to getting-started.md
    227156dac Add ctr support for CPUMax and CPUShares
    b5370b040 Fix comment for metadata/db.go
    5d0730370 Update go-cni to v1.1.5
    180c7535d Upgrade protoc, protoc-gen-go and protoc-gen-go-grpc
    2c6760005 go mod tidy & go mod vendor
    29b937956 make protos
    fcba48636 Remove gogo from .proto files
    ae29594d0 Bump opencontainers/selinux from 1.10.0 to 1.10.1
    46773c341 Cleanup leaked shim process
    7f23296b9 Upgrade google.golang.org/grpc and google.golang.org/protobuf
    7353006f6 Remove kzys/typeurl
    7215f85ac Don't use "uname -a" as Cirrus CI's cache key
    45c0cbec5 Create ppc64le release
    5f43118ce Move Vagrant-based tests from GitHub Actions to Cirrus CI
    00d102da9 feature: support image pull progress timeout
    fceab7f4c remove duplicate
    0e6c7bf93 Fix undefined error in use of errors package
    a9f5190fb images/image.go: typo
    da3e2f985 fix incorrect syntax in comments
    7a4f81d8b Fix tests
    aefd1849b go mod tidy and go mod vendor
    f616dd471 Upgrade containerd/typeurl
    9dbe000a3 make protos
    1a095e18b Rename Size_ to Size
    e3db7de8f Remove gogo/protobuf and adjust types
    fd37cc75b Use protoc-gen-go instead of protoc-gen-gogoctrd
    e044759eb Upgrade containerd/ttrpc
    8710d4d01 cri: close fifos when container is deleted
    7331b2af4 Add Container-Optimized OS into Adopters
    dfa6e8763 diff: hide types.Any from clients
    01dfb110c Add go_package on all proto files
    aa1526def Use proto.Marshal instead of calling Marshal() on objects
    95dde4959 Embed "Unimplemented" structs as proto recommended
    35994a475 fix monitor restart
    237ef0de9 Remove all gogoproto extensions
    22cd13b37 fix nil pointer panic for monitor
    bd90ce043 Keep shim API backward compatible
    39692e767 unpack: return error when no platforms defined
    8017daa12 Add unpack interface to be used by client
    e2fd25f3d Move runtime v2 proto Move runtime v2 protos to api/runtime package.
    3742c756e Don't generate a Go file, if that would be empty
    5f3b72432 Fix protoc-gen-go-fieldpath
    3b82f9e33 metadata: use resource max and end on registration
    88c0c7201 Consolidate gogo/protobuf dependencies under our own protobuf package
    80b825ca2 Remove gogoproto.stdtime
    dbdf50cc0 update golang to 1.18.1, 1.17.9
    fd704d334 Build bin/gen-manpages instead of using "go run"
    b497e6414 Fuzz filter package with Go 1.18's fuzzer
    94faa70df allow ptrace(2) by default for kernel >= 4.8
    fe8da6dca Move lease manager plugin to separate package
    147f0a7e0 check for duplicate nspath possibilities
    942af1203 fix pool_device_test.go
    5f3ce9512 Do not append []string{""} to command to preserve Docker compatibility
    8367f69fb Add collectible resources to metadata gc
    c525aa5f8 Set timeout when collecting metrics from shim's Stat
    49235ccba Change architecture path in README.md
    8a1280b2b metrics/cgroups: fix deadlock issue in Add during Collect
    a5dfbfcf5 cri: load sandboxes/containers/images in parallel
    6d69aca56 make consistent for checkpoint path
    6341e0696 ADOPTERS: Update AKS Info
    b446c7647 [Sandbox] Remove outdated documentation
    d0b32c053 [sandbox] Migrate from gogo to Any
    85a49e4ee [sandbox] Cleanup interfaces
    de4974572 [sandbox] Fix CI
    b7a36950f [Sandbox] Add Wait and PID
    0d165e654 Restore sandboxes on daemon restart
    0c5e5c357 Fix protobuf after rebase
    fa02477ca [sandbox] Add sandbox shim skeleton
    35195737e [sandbox] Register shim plugin after #6301
    17a2aaded [sandbox] Add ctr support
    982de8a5d Launch sandboxed containers from task service
    00f7a6bf2 [sandbox] Address PR review comments
    6343fe3ea [sandbox] Implement sandbox controller
    eaccbf1d0 [sandbox] Add clients
    df234edeb [sandbox] Add controller service
    a433beb79 [sandbox] Update vendor
    0e77f758a [sandbox] Implement store service
    13eb1a4bb [sandbox] Revendor API changes
    d7ece8724 [sandbox] Save sandbox ID to container's store
    cab7d5b3d [sandbox] Implement metadata store
    87d4c8923 [sandbox] Add basic sandbox structures and interfaces
    4445d0a8d [sandbox] Add protobuf definitions
    3df767405 add restart policy for enhanced restart manager
    7e70ad9fb Pin upload-cloud-storage action to 0.8.0 in Windows workflow.
    927b34e41 tracing: fix panic on startup when configured
    1a45c2c5f docs: add Deckhouse to the list of adopters
    825c1c58a CDI: update go.mod and vendor deps
    ff5c55847 move CDI calls to the linux-only code
    c9b4ccf83 add configuration for CDI
    aed0538da cri: implement CDI device injection
    35383fb42 docs/cri: simplify
    493baa6e7 Add docs/snapshots
    811375856 CRI: improve image pulling performance
    16fbbaeee Skip flaky test on Windows
    44d7cd152 mv design docs/historical/design
    195fc7424 docs: migrate config v1 to v2
    84cebafe8 docs: remove deprecated `io.containerd.runtime.v1.linux`
    83665bf8d docs/getting-started.md: typo
    ccea927d9 Move historical docs to `docs/historical`
    50921e71b Run go mod tidy in integration tests
    99c194e03 go.mod: move indirects, and update integration go.mod to 1.18
    6ccec53d3 Remove gotest.tools
    871b6b6a9 Use testify
    6da318310 Disable writing freelist to make the file robust against data corruptions
    62c846b17 Update linters to use t.Setenv
    2d59a3944 Use t.Setenv instead of os.Setenv
    4bdac2b43 Adding multi-arch support for the configure.sh script
    6f269ccb3 docs/getting-started.md: massive update
    c7bdcdfbe Address some timeout issues in the Windows CI
    a2d22ac05 BUILDING.md: update supported Go versions
    d0bd65d3c Remove unmaintained contrib/linuxkit
    f2d5f71a7 update runc binary to v1.1.1
    11a31320b go.mod: github.com/opencontainers/runc v1.1.1
    0b2a95e10 Add no_tracing tag
    b42e936c5 CI: add Rocky Linux 8
    b1030e7b6 CI: bump up crun to 1.4.4
    b737cb10e Update README.md
    cf571fa96 added make help for cri integration
    44a8ac7b0 Turn paths from cmdline into absolute paths
    2689432bf Fix error message in TestNewBinaryIO
    96b16b447 Use typeurl.Any instead of github.com/gogo/protobuf/types.Any
    fe426227d native: fix deadlock from leaving transactions open
    a51da91c1 moving up to go-cni v1.1.4
    36612d692 go.mod: remove replace and update github.com/gogo/googleapis v1.4.1
    df93940fb fix: ctr images mount with snapshotter option can't get snapshotter
    c091d48cb Use cgroups.AddProc() for cgroups v1
    d2013d2c9 runtime: deprecate runc --criu / -criu-path option
    388ee880d Upgrade containerd/imgcrypt and opencontainers/image-spec
    70a06d0c8 Upgrade to Go 1.18
    067611fde Remove enumvalue_customname, goproto_enum_prefix and enum_customname
    bfde58e3c Bug fix for mount path handling
    e9bb9c3bc Skip tty critest testcase on Windows Server 2022
    3eeeb9429 Remove gogoproto.customtype
    040babe00 Vendor dependencies with module graph pruning
    a19ad9bb6 Use Go 1.18 to build and test containerd
    56f95e3d8 Test turning off golang CI lint cache
    ee49c4d55 Add nolint:staticcheck to platform-specific calls
    c56875233 Update prometheus client vendor
    9aadef1be vendor: golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
    fdb746442 document log level and format
    52d307ac1 test: remove redundant `mountPoint`
    2a0b2ee9e fix: ctr run --cni get failed
    18ec2761c test: use `T.TempDir` to create temporary test directory
    b8bf504e9 Enable gosec linter for golangci-lint
    2ddcb2019 Make OpenLab's CI jobs blocking
    cc526a98a Make mkfs.xfs available on OpenLab's CI environment
    ba1674389 typo fixes under cmd.
    2e080bf49 Add shared content label to namespaces
    2a425990c Implement `--device idType://id` for `ctr run` on Windows
    39d52118f Plumb CRI Devices through to OCI WindowsDevices
    6a25be94e CRI integration test for Windows Device mounts
    622a35a4f Upgrade golangci-lint and its GitHub Action
    59b1871b3 Fix link in getting-started.md
    88de65112 Don't build a second copy of containerd-shim-runhcs-v1.exe
    807ded41f Update TestNormalize to only test Windows
    80bc32f06 Use temp file for export/import test
    0d0b2bd4f Mount devmapper xfs file system with "nouuid" option.
    14901335c Increase wait timeout for TestDaemonRestart
    718adfe06 Use the latest image for Windows test workers
    894e78001 Improve ErrUnexpectedStatus default string
    48b478381 Skip most of script/setup/prepare_env_windows.ps1
    768bf73dd Enable cri-tools critest on Windows
    59b978847 Enable CRI Integration tests on Windows
    5b78a9a8f Remove hardcoded /tmp in tempfile paths
    03a5e648b Use version 2 config and mention containerd config command
    e0a6f9c7d update to go 1.16.15, 1.17.8 to address CVE-2022-24921
    b90c466c3 Add ErrUnexpectedStatus to resolver
    fdaf859aa Update status of 1.4 release
    7b045ea5f ctr: improve error relative shim path error msg
    e5efc260d Update latest release versions
    63dd929af Update release process to include Kubernetes test infrastructure
    0c79257f5 Add --user support for ctr run Windows
    de3d9993f Adds support for Windows ArgsEscaped images
    775facd57 cri: fix integration test on cgroupsv2 system
    f1f69d4ee integration: remove duplicated util pkg
    352a8f49f cri: relax test for system without hugetlb
    ec90efbe9 Make the temp mount as ready only in container WithVolumes
    ea3d2e643 go.mod: update to github.com/tchap/go-patricia/v2 v2.3.1
    2b68c03a6 Update Go version recommendation in getting started
    77c0539e9 Use containerd/protobuild instead of stevvooe/protobuild
    d28981d48 Fix build with gccgo
    f4f41296c Replace golang.org/x/net/context with std library
    296f75bd0 Do not use weak import
    3febabffe Add protoc-gen-go-fieldpath
    7901f4b33 containerd-shim-runc-v1: return init pid when clean dead shim
    a3303e721 Update TestContainerSymlinkVolumes to use windows path
    481fb923c go.mod: update to github.com/emicklei/go-restful/v3 v3.7.3
    fb0b8d617 Use fs.RootPath when mounting volumes
    1a31772a7 go.mod: github.com/moby/sys/signal v0.7.0
    b1881bdc0 go.mod: github.com/moby/sys/mountinfo v0.6.0
    b6a6757c1 go.mod: github.com/fsnotify/fsnotify v1.5.1
    83c80388b Initialize platform matchers for current platform
    b63000c65 [Windows][Integration] Enable TestRestartMonitor
    7275411ec cgroup2: monitor OOMKill instead of OOM to prevent missing container OOM events
    6906b57c7 Fix the Inheritable capability defaults.
    fdbfde5d8 cmd/containerd-shim: add -v (version) flag
    e79aba10d integration/images/volume-ownership: strip path information from usage output
    b8cadf753 runtime/v2/shim: strip path information from version output
    356ca7575 containerd-shim-runc-v2: return init pid when clean dead shim
    86d52fc26 Fuzzing: refactor metadata fuzzers
    894af07e3 integration: Adds Windows equivalent for TestSandboxRemoveWithoutIPLeakage
    54e95e6b8 fix Implicit memory aliasing in for loop
    5d4dc5780 remotes/docker: log registry URLs as info instead of debug
    afe39bebf add oci.WithAllDevicesAllowed flag for privileged_without_host_devices

Signed-off-by: Bruce Ashfield <[email protected]>
  • Loading branch information
zeddii committed Feb 10, 2023
1 parent ceb483a commit 202f388
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Signed-off-by: Bruce Ashfield <[email protected]>
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git git.orig/Makefile git.orig/Makefile
index c61418e60..54a10eb42 100644
--- git.orig/Makefile
+++ git.orig/Makefile
@@ -112,7 +112,8 @@ endif
GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n")
Index: containerd/Makefile
===================================================================
--- containerd.orig/Makefile
+++ containerd/Makefile
@@ -127,7 +127,8 @@
GOPATHS=$(shell go env GOPATH | tr ":" "\n" | tr ";" "\n")

TESTFLAGS_RACE=
-GO_BUILD_FLAGS=
Expand All @@ -33,6 +33,3 @@ index c61418e60..54a10eb42 100644
# See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809
GO_GCFLAGS=$(shell \
set -- ${GOPATHS}; \
--
2.19.1

Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
support as well as checkpoint and restore for cloning and live migration of containers."


SRCREV = "ccfc27e30d9f599efe6a7471ea1932dedf2beec8"
SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https;destsuffix=git/src/github.com/containerd/containerd \
SRCREV = "f2cf411b79fab1cb95ae1bc968c8f35b5f4eef35"
SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd \
file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
"
Expand All @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"

CONTAINERD_VERSION = "v1.6.12"
CVE_VERSION = "1.6.12"
CONTAINERD_VERSION = "v1.7.0-beta"
CVE_VERSION = "1.7.0-beta"

# EXTRA_OEMAKE += "GODEBUG=1"

Expand Down

0 comments on commit 202f388

Please sign in to comment.