Skip to content

Commit de5c9cf

Browse files
thaJeztahthaJeztah
authored
Merge pull request #47912 from thaJeztah/26.1_backport_vendor_containerd_1.7.18
[26.1 backport] vendor: github.com/containerd/containerd v1.7.18
2 parents c62dcf8 + 17315a2 commit de5c9cf

File tree

131 files changed

+484
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+484
-301
lines changed

‎.golangci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ linters-settings:
3838
alias:
3939
# Enforce alias to prevent it accidentally being used instead of our
4040
# own errdefs package (or vice-versa).
41-
- pkg: github.com/containerd/containerd/errdefs
41+
- pkg: github.com/containerd/errdefs
4242
alias: cerrdefs
4343
- pkg: github.com/opencontainers/image-spec/specs-go/v1
4444
alias: ocispec
@@ -57,6 +57,10 @@ linters-settings:
5757
desc: Use "gotest.tools/v3/assert" instead
5858
- pkg: "github.com/stretchr/testify/suite"
5959
desc: Do not use
60+
- pkg: github.com/containerd/containerd/errdefs
61+
desc: The errdefs package has moved to a separate module, https://github.com/containerd/errdefs
62+
- pkg: github.com/containerd/containerd/log
63+
desc: The logs package has moved to a separate module, https://github.com/containerd/log
6064
revive:
6165
rules:
6266
# FIXME make sure all packages have a description. Currently, there's many packages without.

‎api/server/httpstatus/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"net/http"
77

8-
cerrdefs "github.com/containerd/containerd/errdefs"
8+
cerrdefs "github.com/containerd/errdefs"
99
"github.com/containerd/log"
1010
"github.com/docker/distribution/registry/api/errcode"
1111
"github.com/docker/docker/errdefs"

‎builder/builder-next/adapters/containerimage/pull.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"time"
1616

1717
"github.com/containerd/containerd/content"
18-
cerrdefs "github.com/containerd/containerd/errdefs"
1918
"github.com/containerd/containerd/gc"
2019
"github.com/containerd/containerd/images"
2120
"github.com/containerd/containerd/leases"
@@ -25,6 +24,7 @@ import (
2524
"github.com/containerd/containerd/remotes"
2625
"github.com/containerd/containerd/remotes/docker"
2726
"github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1.
27+
cerrdefs "github.com/containerd/errdefs"
2828
"github.com/containerd/log"
2929
distreference "github.com/distribution/reference"
3030
dimages "github.com/docker/docker/daemon/images"

‎builder/builder-next/adapters/snapshot/snapshot.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"strings"
88
"sync"
99

10-
cerrdefs "github.com/containerd/containerd/errdefs"
1110
"github.com/containerd/containerd/leases"
1211
"github.com/containerd/containerd/mount"
1312
"github.com/containerd/containerd/snapshots"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/docker/docker/daemon/graphdriver"
1515
"github.com/docker/docker/layer"
1616
"github.com/docker/docker/pkg/idtools"

‎daemon/containerd/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88

99
"github.com/containerd/containerd/content"
10-
cerrdefs "github.com/containerd/containerd/errdefs"
10+
cerrdefs "github.com/containerd/errdefs"
1111
"github.com/containerd/log"
1212
"github.com/docker/docker/api/types/backend"
1313
"github.com/docker/docker/api/types/container"

‎daemon/containerd/handlers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55

66
"github.com/containerd/containerd/content"
7-
cerrdefs "github.com/containerd/containerd/errdefs"
87
containerdimages "github.com/containerd/containerd/images"
8+
cerrdefs "github.com/containerd/errdefs"
99
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1010
)
1111

‎daemon/containerd/image.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"sync/atomic"
1111
"time"
1212

13-
cerrdefs "github.com/containerd/containerd/errdefs"
1413
containerdimages "github.com/containerd/containerd/images"
1514
"github.com/containerd/containerd/platforms"
15+
cerrdefs "github.com/containerd/errdefs"
1616
"github.com/containerd/log"
1717
"github.com/distribution/reference"
1818
"github.com/docker/docker/api/types/backend"

‎daemon/containerd/image_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313

1414
"github.com/containerd/containerd"
1515
"github.com/containerd/containerd/content"
16-
cerrdefs "github.com/containerd/containerd/errdefs"
1716
containerdimages "github.com/containerd/containerd/images"
1817
"github.com/containerd/containerd/leases"
1918
"github.com/containerd/containerd/mount"
2019
"github.com/containerd/containerd/platforms"
2120
"github.com/containerd/containerd/rootfs"
21+
cerrdefs "github.com/containerd/errdefs"
2222
"github.com/containerd/log"
2323
"github.com/distribution/reference"
2424
"github.com/docker/docker/api/types/backend"

‎daemon/containerd/image_commit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
"github.com/containerd/containerd/content"
1414
"github.com/containerd/containerd/diff"
15-
cerrdefs "github.com/containerd/containerd/errdefs"
1615
"github.com/containerd/containerd/leases"
1716
"github.com/containerd/containerd/mount"
1817
"github.com/containerd/containerd/pkg/cleanup"
1918
"github.com/containerd/containerd/snapshots"
19+
cerrdefs "github.com/containerd/errdefs"
2020
"github.com/containerd/log"
2121
"github.com/docker/docker/api/types/backend"
2222
"github.com/docker/docker/image"

‎daemon/containerd/image_delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"strings"
77
"time"
88

9-
cerrdefs "github.com/containerd/containerd/errdefs"
109
"github.com/containerd/containerd/images"
1110
containerdimages "github.com/containerd/containerd/images"
11+
cerrdefs "github.com/containerd/errdefs"
1212
"github.com/containerd/log"
1313
"github.com/distribution/reference"
1414
"github.com/docker/docker/api/types/events"

‎daemon/containerd/image_exporter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88

99
"github.com/containerd/containerd"
1010
"github.com/containerd/containerd/content"
11-
cerrdefs "github.com/containerd/containerd/errdefs"
1211
containerdimages "github.com/containerd/containerd/images"
1312
"github.com/containerd/containerd/images/archive"
1413
"github.com/containerd/containerd/leases"
1514
"github.com/containerd/containerd/platforms"
15+
cerrdefs "github.com/containerd/errdefs"
1616
"github.com/containerd/log"
1717
"github.com/distribution/reference"
1818
"github.com/docker/docker/api/types/events"

‎daemon/containerd/image_import.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"time"
1111

1212
"github.com/containerd/containerd/content"
13-
cerrdefs "github.com/containerd/containerd/errdefs"
1413
"github.com/containerd/containerd/images"
1514
"github.com/containerd/containerd/platforms"
15+
cerrdefs "github.com/containerd/errdefs"
1616
"github.com/containerd/log"
1717
"github.com/distribution/reference"
1818
"github.com/docker/docker/api/types/container"

‎daemon/containerd/image_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"time"
1111

1212
"github.com/containerd/containerd/content"
13-
cerrdefs "github.com/containerd/containerd/errdefs"
1413
"github.com/containerd/containerd/images"
1514
"github.com/containerd/containerd/labels"
1615
"github.com/containerd/containerd/platforms"
1716
cplatforms "github.com/containerd/containerd/platforms"
1817
"github.com/containerd/containerd/snapshots"
18+
cerrdefs "github.com/containerd/errdefs"
1919
"github.com/containerd/log"
2020
"github.com/distribution/reference"
2121
"github.com/docker/docker/api/types/backend"

‎daemon/containerd/image_prune.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"strings"
66

7-
cerrdefs "github.com/containerd/containerd/errdefs"
87
containerdimages "github.com/containerd/containerd/images"
8+
cerrdefs "github.com/containerd/errdefs"
99
"github.com/containerd/log"
1010
"github.com/distribution/reference"
1111
"github.com/docker/docker/api/types"

‎daemon/containerd/image_pull.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"time"
1010

1111
"github.com/containerd/containerd"
12-
cerrdefs "github.com/containerd/containerd/errdefs"
1312
"github.com/containerd/containerd/images"
1413
"github.com/containerd/containerd/pkg/snapshotters"
1514
"github.com/containerd/containerd/platforms"
1615
"github.com/containerd/containerd/remotes/docker"
16+
cerrdefs "github.com/containerd/errdefs"
1717
"github.com/containerd/log"
1818
"github.com/distribution/reference"
1919
"github.com/docker/docker/api/types/events"

‎daemon/containerd/image_push.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"time"
1010

1111
"github.com/containerd/containerd/content"
12-
cerrdefs "github.com/containerd/containerd/errdefs"
1312
"github.com/containerd/containerd/images"
1413
containerdimages "github.com/containerd/containerd/images"
1514
containerdlabels "github.com/containerd/containerd/labels"
1615
"github.com/containerd/containerd/platforms"
1716
"github.com/containerd/containerd/remotes"
1817
"github.com/containerd/containerd/remotes/docker"
18+
cerrdefs "github.com/containerd/errdefs"
1919
"github.com/containerd/log"
2020
"github.com/distribution/reference"
2121
"github.com/docker/docker/api/types/events"

‎daemon/containerd/image_snapshot.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"fmt"
66

77
"github.com/containerd/containerd"
8-
cerrdefs "github.com/containerd/containerd/errdefs"
98
containerdimages "github.com/containerd/containerd/images"
109
"github.com/containerd/containerd/leases"
1110
"github.com/containerd/containerd/mount"
1211
"github.com/containerd/containerd/platforms"
1312
"github.com/containerd/containerd/snapshots"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/docker/docker/errdefs"
1515
"github.com/opencontainers/image-spec/identity"
1616
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎daemon/containerd/image_tag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"fmt"
66

7-
cerrdefs "github.com/containerd/containerd/errdefs"
87
containerdimages "github.com/containerd/containerd/images"
8+
cerrdefs "github.com/containerd/errdefs"
99
"github.com/containerd/log"
1010
"github.com/distribution/reference"
1111
"github.com/docker/docker/api/types/events"

‎daemon/containerd/progress.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"time"
88

99
"github.com/containerd/containerd/content"
10-
cerrdefs "github.com/containerd/containerd/errdefs"
1110
"github.com/containerd/containerd/images"
1211
"github.com/containerd/containerd/remotes"
1312
"github.com/containerd/containerd/remotes/docker"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/containerd/log"
1515
"github.com/distribution/reference"
1616
"github.com/docker/docker/internal/compatcontext"

‎daemon/containerd/resolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"errors"
77
"net/http"
88

9-
cerrdefs "github.com/containerd/containerd/errdefs"
109
"github.com/containerd/containerd/remotes"
1110
"github.com/containerd/containerd/remotes/docker"
1211
"github.com/containerd/containerd/version"
12+
cerrdefs "github.com/containerd/errdefs"
1313
"github.com/containerd/log"
1414
"github.com/distribution/reference"
1515
registrytypes "github.com/docker/docker/api/types/registry"

‎daemon/containerd/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
"github.com/containerd/containerd"
99
"github.com/containerd/containerd/content"
10-
cerrdefs "github.com/containerd/containerd/errdefs"
1110
"github.com/containerd/containerd/images"
1211
"github.com/containerd/containerd/plugin"
1312
"github.com/containerd/containerd/remotes/docker"
1413
"github.com/containerd/containerd/snapshots"
14+
cerrdefs "github.com/containerd/errdefs"
1515
"github.com/containerd/log"
1616
"github.com/distribution/reference"
1717
"github.com/docker/docker/container"

‎daemon/containerd/soft_delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package containerd
33
import (
44
"context"
55

6-
cerrdefs "github.com/containerd/containerd/errdefs"
76
containerdimages "github.com/containerd/containerd/images"
7+
cerrdefs "github.com/containerd/errdefs"
88
"github.com/docker/docker/errdefs"
99
"github.com/docker/docker/internal/compatcontext"
1010
"github.com/opencontainers/go-digest"

‎daemon/containerd/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55

66
"github.com/containerd/containerd/content"
7-
cerrdefs "github.com/containerd/containerd/errdefs"
87
containerdlabels "github.com/containerd/containerd/labels"
8+
cerrdefs "github.com/containerd/errdefs"
99
"github.com/distribution/reference"
1010
"github.com/opencontainers/go-digest"
1111
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎daemon/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99
"time"
1010

11-
cerrdefs "github.com/containerd/containerd/errdefs"
1211
"github.com/containerd/containerd/leases"
12+
cerrdefs "github.com/containerd/errdefs"
1313
"github.com/containerd/log"
1414
"github.com/docker/docker/api/types/backend"
1515
containertypes "github.com/docker/docker/api/types/container"

‎daemon/images/image.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"io"
88

99
"github.com/containerd/containerd/content"
10-
cerrdefs "github.com/containerd/containerd/errdefs"
1110
"github.com/containerd/containerd/images"
1211
"github.com/containerd/containerd/leases"
1312
"github.com/containerd/containerd/platforms"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/containerd/log"
1515
"github.com/distribution/reference"
1616
"github.com/docker/docker/api/types/backend"

‎daemon/images/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"sync"
66

77
"github.com/containerd/containerd/content"
8-
cerrdefs "github.com/containerd/containerd/errdefs"
98
"github.com/containerd/containerd/leases"
109
"github.com/containerd/containerd/namespaces"
10+
cerrdefs "github.com/containerd/errdefs"
1111
"github.com/containerd/log"
1212
"github.com/docker/docker/distribution"
1313
"github.com/docker/docker/image"

‎daemon/images/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
"github.com/containerd/containerd/content"
1010
"github.com/containerd/containerd/content/local"
11-
cerrdefs "github.com/containerd/containerd/errdefs"
1211
"github.com/containerd/containerd/leases"
1312
"github.com/containerd/containerd/metadata"
1413
"github.com/containerd/containerd/namespaces"
14+
cerrdefs "github.com/containerd/errdefs"
1515
"github.com/docker/docker/image"
1616
"github.com/opencontainers/go-digest"
1717
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎distribution/manifest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010

1111
"github.com/containerd/containerd/content"
12-
cerrdefs "github.com/containerd/containerd/errdefs"
1312
"github.com/containerd/containerd/remotes"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/containerd/log"
1515
"github.com/distribution/reference"
1616
"github.com/docker/distribution"

‎distribution/manifest_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/containerd/containerd/content"
1212
"github.com/containerd/containerd/content/local"
13-
cerrdefs "github.com/containerd/containerd/errdefs"
1413
"github.com/containerd/containerd/remotes"
14+
cerrdefs "github.com/containerd/errdefs"
1515
"github.com/distribution/reference"
1616
"github.com/docker/distribution"
1717
"github.com/docker/distribution/manifest/manifestlist"

‎integration/container/pause_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
cerrdefs "github.com/containerd/containerd/errdefs"
8+
cerrdefs "github.com/containerd/errdefs"
99
"github.com/docker/docker/api/types"
1010
containertypes "github.com/docker/docker/api/types/container"
1111
"github.com/docker/docker/api/types/events"

‎libcontainerd/local/local_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/Microsoft/hcsshim"
1919
"github.com/containerd/containerd"
2020
"github.com/containerd/containerd/cio"
21-
cerrdefs "github.com/containerd/containerd/errdefs"
21+
cerrdefs "github.com/containerd/errdefs"
2222
"github.com/containerd/log"
2323
"github.com/docker/docker/errdefs"
2424
"github.com/docker/docker/libcontainerd/queue"

‎libcontainerd/remote/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"github.com/containerd/containerd/archive"
2020
"github.com/containerd/containerd/cio"
2121
"github.com/containerd/containerd/content"
22-
cerrdefs "github.com/containerd/containerd/errdefs"
2322
"github.com/containerd/containerd/images"
2423
"github.com/containerd/containerd/protobuf"
2524
v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
25+
cerrdefs "github.com/containerd/errdefs"
2626
"github.com/containerd/log"
2727
"github.com/containerd/typeurl/v2"
2828
"github.com/docker/docker/errdefs"

‎plugin/fetch_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"time"
88

99
"github.com/containerd/containerd/content"
10-
cerrdefs "github.com/containerd/containerd/errdefs"
1110
"github.com/containerd/containerd/images"
1211
"github.com/containerd/containerd/remotes"
1312
"github.com/containerd/containerd/remotes/docker"
13+
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/containerd/log"
1515
"github.com/distribution/reference"
1616
"github.com/docker/docker/api/types/registry"

‎vendor.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ require (
2525
github.com/aws/smithy-go v1.19.0
2626
github.com/cloudflare/cfssl v1.6.4
2727
github.com/containerd/cgroups/v3 v3.0.3
28-
github.com/containerd/containerd v1.7.17
28+
github.com/containerd/containerd v1.7.18
2929
github.com/containerd/continuity v0.4.3
30+
github.com/containerd/errdefs v0.1.0
3031
github.com/containerd/fifo v1.1.0
3132
github.com/containerd/log v0.1.0
3233
github.com/containerd/typeurl/v2 v2.1.1

0 commit comments

Comments
 (0)