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.

Sign up for GitHub

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

Jump to bottom

bump github.com/containerd/containerd to v1.7.20 #28711

Merged
merged 2 commits into from
Aug 23, 2024
Merged

bump github.com/containerd/containerd to v1.7.20 #28711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5628c
bump `github.com/containerd/containerd` to v1.7.20
paulcacheux Aug 23, 2024
8cb1e50
fix deprecation warning
paulcacheux Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ core,github.com/containerd/containerd/contrib/seccomp/kernelversion,Apache-2.0,"
core,github.com/containerd/containerd/defaults,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/diff,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/diff/proxy,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/errdefs,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/errdefs,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/events,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/events/exchange,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/filters,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
Expand Down Expand Up @@ -797,7 +797,6 @@ core,github.com/containerd/containerd/pkg/userns,Apache-2.0,"Copyright 2012-2015
core,github.com/containerd/containerd/platforms,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/plugin,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/protobuf,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/protobuf/plugin,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/protobuf/proto,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/protobuf/types,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/containerd/reference,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
Expand All @@ -824,6 +823,7 @@ core,github.com/containerd/continuity/sysx,Apache-2.0,"Copyright 2012-2015 Docke
core,github.com/containerd/errdefs,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/fifo,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/log,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/platforms,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/stargz-snapshotter/estargz,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/stargz-snapshotter/estargz/errorutil,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
core,github.com/containerd/ttrpc,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
Expand Down
2 changes: 1 addition & 1 deletion comp/core/workloadmeta/collectors/internal/containerd/container_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"time"

"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/errdefs"

"github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors/util"
workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
Expand Down
10 changes: 6 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ require (
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/cilium/ebpf v0.16.0
github.com/clbanning/mxj v1.8.4
github.com/containerd/containerd v1.7.18
github.com/containerd/containerd v1.7.20
github.com/containernetworking/cni v1.2.3
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd v22.5.0+incompatible
Expand Down Expand Up @@ -393,7 +393,7 @@ require (
github.com/containerd/continuity v0.4.3 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
github.com/containerd/ttrpc v1.2.4 // indirect
github.com/containerd/ttrpc v1.2.5 // indirect
github.com/containernetworking/plugins v1.4.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
Expand Down Expand Up @@ -594,6 +594,9 @@ require (

require (
github.com/DataDog/datadog-agent/comp/core/tagger/utils v0.0.0-00010101000000-000000000000
github.com/containerd/containerd/api v1.7.19
github.com/containerd/errdefs v0.1.0
github.com/distribution/reference v0.6.0
github.com/lorenzosaino/go-sysctl v0.3.1
)

Expand Down Expand Up @@ -794,12 +797,11 @@ require (
github.com/chrusty/protoc-gen-jsonschema v0.0.0-20240212064413-73d5723042b8 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/csaf-poc/csaf_distribution/v3 v3.0.0 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/digitalocean/godo v1.109.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
github.com/elastic/go-licenser v0.4.1 // indirect
Expand Down
16 changes: 10 additions & 6 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/util/containerd/containerd_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/errdefs"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/trivy/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/namespaces"
refdocker "github.com/containerd/containerd/reference/docker"
refdocker "github.com/distribution/reference"
api "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/trivy/trivy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ import (
"github.com/aquasecurity/trivy/pkg/types"
"github.com/aquasecurity/trivy/pkg/vulnerability"
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
"github.com/containerd/errdefs"
"github.com/docker/docker/client"

// This is required to load sqlite based RPM databases
Expand Down
Loading