admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump github.com/containerd/containerd from v1.6.16 to 1.6.18 (#5599)

Browse Source 
fix: Bump github.com/containerd/containerd from v1.6.16 to 1.6.18

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
hongzhouzi
2023-03-20 11:13:13 +08:00
committed by GitHub
parent 4cd5b81ceb
commit 988d185a28
7 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -130,7 +130,7 @@ require (
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/containerd/containerd v1.6.16 // indirect
github.com/containerd/containerd v1.6.18 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
@@ -325,7 +325,7 @@ replace (
github.com/blang/semver/v4 => github.com/blang/semver/v4 v4.0.0
github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.2.0
github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v1.0.2
github.com/containerd/containerd => github.com/containerd/containerd v1.6.16
github.com/containerd/containerd => github.com/containerd/containerd v1.6.18
github.com/containernetworking/cni => github.com/containernetworking/cni v1.1.2
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.2.3

4
go.sum
View File

@@ -387,8 +387,8 @@ github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on
github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/containerd/containerd v1.6.16 h1:0H5xH6ABsN7XTrxIAKxFpBkFCBtrZ/OSORhCpUnHjrc=
github.com/containerd/containerd v1.6.16/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns=
github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
github.com/containerd/continuity v0.2.1/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg=

2
staging/src/kubesphere.io/utils/go.mod
View File

@@ -30,7 +30,7 @@ require (
github.com/bugsnag/panicwrap v1.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/containerd/containerd v1.6.16 // indirect
github.com/containerd/containerd v1.6.18 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.22+incompatible // indirect

4
staging/src/kubesphere.io/utils/go.sum
View File

@@ -97,8 +97,8 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
github.com/containerd/containerd v1.6.16 h1:0H5xH6ABsN7XTrxIAKxFpBkFCBtrZ/OSORhCpUnHjrc=
github.com/containerd/containerd v1.6.16/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns=
github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

12
vendor/github.com/containerd/containerd/platforms/defaults_windows.go generated vendored
View File

@@ -46,10 +46,14 @@ type matchComparer struct {
// Match matches platform with the same windows major, minor
// and build version.
func (m matchComparer) Match(p imagespec.Platform) bool {
if m.defaults.Match(p) {
// TODO(windows): Figure out whether OSVersion is deprecated.
return strings.HasPrefix(p.OSVersion, m.osVersionPrefix)
func (m matchComparer) Match(p specs.Platform) bool {
match := m.defaults.Match(p)
if match && p.OS == "windows" {
if strings.HasPrefix(p.OSVersion, m.osVersionPrefix) {
return true
}
return p.OSVersion == ""
}
return false
}

2
vendor/github.com/containerd/containerd/version/version.go generated vendored
View File

@@ -23,7 +23,7 @@ var (
Package = "github.com/containerd/containerd"
// Version holds the complete version number. Filled in at linking time.
Version = "1.6.16+unknown"
Version = "1.6.18+unknown"
// Revision is filled with the VCS (e.g. git) revision being used to build
// the program at linking time.

4
vendor/modules.txt vendored
View File

@@ -126,7 +126,7 @@ github.com/chai2010/gettext-go
github.com/chai2010/gettext-go/mo
github.com/chai2010/gettext-go/plural
github.com/chai2010/gettext-go/po
# github.com/containerd/containerd v1.6.16 => github.com/containerd/containerd v1.6.16
# github.com/containerd/containerd v1.6.18 => github.com/containerd/containerd v1.6.18
## explicit; go 1.17
github.com/containerd/containerd/archive/compression
github.com/containerd/containerd/content
@@ -2648,7 +2648,7 @@ sigs.k8s.io/yaml
# github.com/blang/semver/v4 => github.com/blang/semver/v4 v4.0.0
# github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.2.0
# github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v1.0.2
# github.com/containerd/containerd => github.com/containerd/containerd v1.6.16
# github.com/containerd/containerd => github.com/containerd/containerd v1.6.18
# github.com/containernetworking/cni => github.com/containernetworking/cni v1.1.2
# github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
# github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.2.3