Skip to content

Commit 452ec25

Browse files
kiashokkiashok
committed
Merge branch 'upstream-main' into dev/kiashok/updateForkExternal
2 parents ebe5b9b + 33fab02 commit 452ec25

1,013 files changed

Lines changed: 6672 additions & 54878 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v3
4040
- uses: golangci/golangci-lint-action@v3
4141
with:
42-
version: v1.54.2
42+
version: v1.55.0
4343
skip-cache: true
4444
args: --timeout=8m
4545

@@ -244,7 +244,7 @@ jobs:
244244
strategy:
245245
fail-fast: false
246246
matrix:
247-
os: [windows-2019, windows-2022]
247+
os: [windows-2022] # windows-2019 is temporarily removed until mingw issue fixed
248248

249249
defaults:
250250
run:

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ issues:
3232
- path: 'archive[\\/]tarheader[\\/]'
3333
# conversion is necessary on Linux, unnecessary on macOS
3434
text: "unnecessary conversion"
35+
- path: 'integration[\\/]client'
36+
text: "dot-imports:"
3537
- linters:
3638
- revive
3739
text: "if-return"
@@ -63,6 +65,8 @@ linters-settings:
6365
- G306
6466
- G402
6567
- G404
68+
nolintlint:
69+
allow-unused: true
6670

6771
run:
6872
timeout: 8m

‎Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ STATICRELEASE=containerd-static-$(VERSION:v%=%)-${GOOS}-${GOARCH}
8181
CRIRELEASE=cri-containerd-$(VERSION:v%=%)-${GOOS}-${GOARCH}
8282
CRICNIRELEASE=cri-containerd-cni-$(VERSION:v%=%)-${GOOS}-${GOARCH}
8383

84-
PKG=github.com/containerd/containerd
84+
PKG=github.com/containerd/containerd/v2
8585

8686
# Project binaries.
8787
COMMANDS=ctr containerd containerd-stress
@@ -179,8 +179,9 @@ protos: bin/protoc-gen-go-fieldpath
179179
@mv ${ROOTDIR}/vendor ${TMPDIR}
180180
@(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES})
181181
@(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_API_PACKAGES})
182+
find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
182183
@mv ${TMPDIR}/vendor ${ROOTDIR}
183-
@rm -rf ${TMPDIR}
184+
@rm -rf ${TMPDIR} v2
184185
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go')
185186

186187
check-protos: protos ## check if protobufs needs to be generated again
@@ -472,7 +473,7 @@ vendor: ## ensure all the go.mod/go.sum files are up-to-date including vendor/ d
472473
@$(GO) mod tidy
473474
@$(GO) mod vendor
474475
@$(GO) mod verify
475-
@(cd ${ROOTDIR}/integration/client && ${GO} mod tidy)
476+
#@(cd ${ROOTDIR}/integration/client && ${GO} mod tidy)
476477

477478
verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date
478479
@echo "$(WHALE) $@"
@@ -482,7 +483,7 @@ verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date
482483
@(cd ${TMPDIR}/containerd/integration/client && ${GO} mod tidy)
483484
@diff -r -u -q ${ROOTDIR} ${TMPDIR}/containerd
484485
@rm -rf ${TMPDIR}
485-
@${ROOTDIR}/script/verify-go-modules.sh integration/client
486+
#@${ROOTDIR}/script/verify-go-modules.sh integration/client
486487

487488

488489
help: ## this help

‎api/events/container.pb.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/container.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package containerd.events;
2121
import "google/protobuf/any.proto";
2222
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2323

24-
option go_package = "github.com/containerd/containerd/api/events;events";
24+
option go_package = "github.com/containerd/containerd/v2/api/events;events";
2525
option (containerd.plugin.fieldpath_all) = true;
2626

2727
message ContainerCreate {

‎api/events/content.pb.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/content.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package containerd.events;
2020

2121
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2222

23-
option go_package = "github.com/containerd/containerd/api/events;events";
23+
option go_package = "github.com/containerd/containerd/v2/api/events;events";
2424
option (containerd.plugin.fieldpath_all) = true;
2525

2626
message ContentDelete {

‎api/events/image.pb.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/image.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package containerd.services.images.v1;
2020

2121
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2222

23-
option go_package = "github.com/containerd/containerd/api/events;events";
23+
option go_package = "github.com/containerd/containerd/v2/api/events;events";
2424
option (containerd.plugin.fieldpath_all) = true;
2525

2626
message ImageCreate {

‎api/events/namespace.pb.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)