Skip to content

Commit d3db35e

Browse files
swagatbora90sondavidb
swagatbora90
and
sondavidb
authored
refactor: Update containerd and nerdctl v2 (runfinch#148)
* chore: update to nerdctl v2.0.0 Signed-off-by: David Son <[email protected]> * chore: update containerd to v2.0.0 Signed-off-by: David Son <[email protected]> * refactor: code changes for nerdctl + containerd 2.0 Signed-off-by: David Son <[email protected]> * chore: Rebase changes and update go.mod to latest containerd and nerdctl versions Signed-off-by: Swagat Bora <[email protected]> --------- Signed-off-by: David Son <[email protected]> Signed-off-by: Swagat Bora <[email protected]> Co-authored-by: David Son <[email protected]>
1 parent f7c7b30 commit d3db35e

File tree

200 files changed

+777
-678
lines changed

Some content is hidden

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

200 files changed

+777
-678
lines changed

‎Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ endif
8080
GOBIN=$(BIN) go install github.com/golang/mock/mockgen
8181
GOBIN=$(BIN) go install golang.org/x/tools/cmd/stringer
8282
PATH=$(BIN):$(PATH) go generate ./...
83-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/container.go -package=mocks_container github.com/containerd/containerd Container
84-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/process.go -package=mocks_container github.com/containerd/containerd Process
85-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/task.go -package=mocks_container github.com/containerd/containerd Task
86-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_image/store.go -package=mocks_image github.com/containerd/containerd/images Store
87-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/network_manager.go -package=mocks_container github.com/containerd/nerdctl/pkg/containerutil NetworkOptionsManager
88-
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_cio/io.go -package=mocks_cio github.com/containerd/containerd/cio IO
83+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/container.go -package=mocks_container github.com/containerd/containerd/v2/client Container
84+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/process.go -package=mocks_container github.com/containerd/containerd/v2/client Process
85+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/task.go -package=mocks_container github.com/containerd/containerd/v2/client Task
86+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_image/store.go -package=mocks_image github.com/containerd/containerd/v2/core/images Store
87+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/network_manager.go -package=mocks_container github.com/containerd/nerdctl/v2/pkg/containerutil NetworkOptionsManager
88+
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_cio/io.go -package=mocks_cio github.com/containerd/containerd/v2/pkg/cio IO
8989
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/response_writer.go -package=mocks_http net/http ResponseWriter
9090
PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/conn.go -package=mocks_http net Conn
9191

‎api/handlers/builder/build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"net/http"
1111
"strconv"
1212

13-
"github.com/containerd/containerd/namespaces"
14-
"github.com/containerd/nerdctl/pkg/api/types"
13+
"github.com/containerd/containerd/v2/pkg/namespaces"
14+
"github.com/containerd/nerdctl/v2/pkg/api/types"
1515

1616
"github.com/runfinch/finch-daemon/api/response"
1717
"github.com/runfinch/finch-daemon/pkg/utility/maputility"

‎api/handlers/builder/build_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/http"
1212
"net/http/httptest"
1313

14-
"github.com/containerd/nerdctl/pkg/config"
14+
"github.com/containerd/nerdctl/v2/pkg/config"
1515
"github.com/golang/mock/gomock"
1616
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"

‎api/handlers/builder/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"io"
1010
"net/http"
1111

12-
ncTypes "github.com/containerd/nerdctl/pkg/api/types"
13-
"github.com/containerd/nerdctl/pkg/config"
12+
ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types"
13+
"github.com/containerd/nerdctl/v2/pkg/config"
1414

1515
"github.com/runfinch/finch-daemon/api/types"
1616
"github.com/runfinch/finch-daemon/internal/backend"

‎api/handlers/builder/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net/http/httptest"
1010
"testing"
1111

12-
"github.com/containerd/nerdctl/pkg/config"
12+
"github.com/containerd/nerdctl/v2/pkg/config"
1313
"github.com/golang/mock/gomock"
1414
"github.com/gorilla/mux"
1515
. "github.com/onsi/ginkgo/v2"

‎api/handlers/container/attach_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/runfinch/finch-daemon/api/types"
2222

23-
"github.com/containerd/nerdctl/pkg/config"
23+
"github.com/containerd/nerdctl/v2/pkg/config"
2424
"github.com/golang/mock/gomock"
2525
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"

‎api/handlers/container/container.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"net/http"
1111
"time"
1212

13-
ncTypes "github.com/containerd/nerdctl/pkg/api/types"
14-
"github.com/containerd/nerdctl/pkg/config"
13+
ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types"
14+
"github.com/containerd/nerdctl/v2/pkg/config"
1515

1616
"github.com/runfinch/finch-daemon/api/types"
1717
"github.com/runfinch/finch-daemon/pkg/flog"

‎api/handlers/container/container_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http/httptest"
1111
"testing"
1212

13-
"github.com/containerd/nerdctl/pkg/config"
13+
"github.com/containerd/nerdctl/v2/pkg/config"
1414
"github.com/golang/mock/gomock"
1515
"github.com/gorilla/mux"
1616
. "github.com/onsi/ginkgo/v2"

‎api/handlers/container/create.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"strconv"
1111
"strings"
1212

13-
"github.com/containerd/containerd/namespaces"
13+
"github.com/containerd/containerd/v2/pkg/namespaces"
1414
gocni "github.com/containerd/go-cni"
15-
ncTypes "github.com/containerd/nerdctl/pkg/api/types"
16-
"github.com/containerd/nerdctl/pkg/defaults"
15+
ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types"
16+
"github.com/containerd/nerdctl/v2/pkg/defaults"
1717
"github.com/docker/go-connections/nat"
1818
"github.com/sirupsen/logrus"
1919

‎api/handlers/container/create_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"strings"
1414

1515
gocni "github.com/containerd/go-cni"
16-
"github.com/containerd/nerdctl/pkg/api/types"
17-
"github.com/containerd/nerdctl/pkg/config"
18-
"github.com/containerd/nerdctl/pkg/defaults"
16+
"github.com/containerd/nerdctl/v2/pkg/api/types"
17+
"github.com/containerd/nerdctl/v2/pkg/config"
18+
"github.com/containerd/nerdctl/v2/pkg/defaults"
1919
"github.com/docker/go-connections/nat"
2020
"github.com/golang/mock/gomock"
2121
. "github.com/onsi/ginkgo/v2"

0 commit comments

Comments
 (0)