Merge pull request #3920 from thaJeztah/bump_containerd
vendor: github.com/containerd/containerd/v2 v2.2.5
This commit is contained in:
@@ -9,7 +9,7 @@ require (
|
||||
github.com/aws/aws-sdk-go-v2/config v1.32.24
|
||||
github.com/compose-spec/compose-go/v2 v2.11.0
|
||||
github.com/containerd/console v1.0.5
|
||||
github.com/containerd/containerd/v2 v2.2.4
|
||||
github.com/containerd/containerd/v2 v2.2.5
|
||||
github.com/containerd/continuity v0.5.0
|
||||
github.com/containerd/errdefs v1.0.0
|
||||
github.com/containerd/log v0.1.0
|
||||
|
||||
@@ -120,8 +120,8 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q
|
||||
github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
|
||||
github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o=
|
||||
github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM=
|
||||
github.com/containerd/containerd/v2 v2.2.4 h1:8x2UdXqww7NYqGNabQ7i1nAgB5LegzjC9KQzO/900iA=
|
||||
github.com/containerd/containerd/v2 v2.2.4/go.mod h1:YBcTO8D9149QY9zNmUjy04Mhuc4DlrZQ8FIOwKZEM7o=
|
||||
github.com/containerd/containerd/v2 v2.2.5 h1:KTFzB02LviYmmfRmz8r9UFd+n6YlddVFK+5lbgQXUTU=
|
||||
github.com/containerd/containerd/v2 v2.2.5/go.mod h1:5t2+xFv2dGd/iDYp9Z8DXB4cmWrWQi1XqxGJPS2gBzU=
|
||||
github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg=
|
||||
github.com/containerd/continuity v0.5.0/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
|
||||
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
|
||||
|
||||
+12
@@ -16,6 +16,18 @@
|
||||
|
||||
package labels
|
||||
|
||||
// ReservedPrefix is the prefix of the label namespace reserved for labels
|
||||
// defined and consumed by containerd itself. Labels in this namespace must
|
||||
// not be copied from untrusted sources such as image config labels. Use
|
||||
// IsReserved to check for such labels.
|
||||
const ReservedPrefix = "containerd.io/"
|
||||
|
||||
// CRIContainerdPrefix is the prefix of the label namespace reserved for
|
||||
// labels defined and consumed by containerd's CRI plugin. Labels in this
|
||||
// namespace must not be copied from untrusted sources such as image config
|
||||
// labels. Use IsReserved to check for such labels.
|
||||
const CRIContainerdPrefix = "io.cri-containerd"
|
||||
|
||||
// LabelUncompressed is added to compressed layer contents.
|
||||
// The value is digest of the uncompressed content.
|
||||
const LabelUncompressed = "containerd.io/uncompressed"
|
||||
|
||||
+9
@@ -18,6 +18,7 @@ package labels
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/containerd/errdefs"
|
||||
)
|
||||
@@ -39,3 +40,11 @@ func Validate(k, v string) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// IsReserved returns true if the label key is in a namespace reserved for
|
||||
// containerd (ReservedPrefix) or its CRI plugin (CRIContainerdPrefix).
|
||||
// Reserved labels are interpreted by containerd and must not be copied from
|
||||
// untrusted sources such as image config labels.
|
||||
func IsReserved(k string) bool {
|
||||
return strings.HasPrefix(k, ReservedPrefix) || strings.HasPrefix(k, CRIContainerdPrefix)
|
||||
}
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ var (
|
||||
Package = "github.com/containerd/containerd/v2"
|
||||
|
||||
// Version holds the complete version number. Filled in at linking time.
|
||||
Version = "2.2.4+unknown"
|
||||
Version = "2.2.5+unknown"
|
||||
|
||||
// Revision is filled with the VCS (e.g. git) revision being used to build
|
||||
// the program at linking time.
|
||||
|
||||
Vendored
+2
-2
@@ -215,8 +215,8 @@ github.com/containerd/console
|
||||
# github.com/containerd/containerd/api v1.10.0
|
||||
## explicit; go 1.23.0
|
||||
github.com/containerd/containerd/api/services/content/v1
|
||||
# github.com/containerd/containerd/v2 v2.2.4
|
||||
## explicit; go 1.24.3
|
||||
# github.com/containerd/containerd/v2 v2.2.5
|
||||
## explicit; go 1.25.0
|
||||
github.com/containerd/containerd/v2/core/content
|
||||
github.com/containerd/containerd/v2/core/content/proxy
|
||||
github.com/containerd/containerd/v2/core/images
|
||||
|
||||
Reference in New Issue
Block a user