github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Make api a Go sub-module

Browse Source 
Allow the api to stay at the same v1 go package name and keep using a
1.x version number. This indicates the API is still at 1.x and allows
sharing proto types with containerd 1.6 and 1.7 releases.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-04-29 16:06:34 -07:00
parent e1b94c0e7d
commit 2ac2b9c909
371 changed files with 42158 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cri/server/container_checkpoint_linux.go
View File

@@ -32,7 +32,7 @@ import (
crmetadata "github.com/checkpoint-restore/checkpointctl/lib"
"github.com/checkpoint-restore/go-criu/v7"
"github.com/containerd/containerd/v2/api/types/runc/options"
"github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/archive"

2
internal/cri/server/container_stats.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"fmt"
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/api/services/tasks/v1"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

4
internal/cri/server/container_stats_list.go
View File

@@ -30,8 +30,8 @@ import (
"github.com/containerd/typeurl/v2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/internal/cri/store/stats"
"github.com/containerd/containerd/v2/pkg/protobuf"

2
internal/cri/server/container_stats_list_test.go
View File

@@ -25,7 +25,7 @@ import (
v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/types"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/stretchr/testify/assert"

2
internal/cri/server/container_stop.go
View File

@@ -23,7 +23,7 @@ import (
"syscall"
"time"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/protobuf"

4
internal/cri/server/events.go
View File

@@ -25,8 +25,8 @@ import (
"github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
eventtypes "github.com/containerd/containerd/v2/api/events"
apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
eventtypes "github.com/containerd/containerd/api/events"
apitasks "github.com/containerd/containerd/api/services/tasks/v1"
containerd "github.com/containerd/containerd/v2/client"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"

2
internal/cri/server/events/events.go
View File

@@ -27,7 +27,7 @@ import (
"github.com/containerd/typeurl/v2"
"k8s.io/utils/clock"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/internal/cri/constants"
)

2
internal/cri/server/events/events_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"time"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp"

2
internal/cri/server/helpers_test.go
View File

@@ -26,7 +26,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
runcoptions "github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/containerd/v2/core/containers"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
crilabels "github.com/containerd/containerd/v2/internal/cri/labels"

2
internal/cri/server/podsandbox/controller.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/containerd/plugin/registry"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"

2
internal/cri/server/podsandbox/events.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/containerd/log"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
)

2
internal/cri/server/podsandbox/recover_test.go
View File

@@ -28,7 +28,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/types"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"

2
internal/cri/server/podsandbox/sandbox_delete.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"fmt"
apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
apitasks "github.com/containerd/containerd/api/services/tasks/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/errdefs"
"github.com/containerd/log"

2
internal/cri/server/podsandbox/sandbox_stats.go
View File

@@ -19,7 +19,7 @@ package podsandbox
import (
"context"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/types"
"github.com/containerd/errdefs"
)

2
internal/cri/server/podsandbox/sandbox_stop.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/containerd/errdefs"
"github.com/containerd/log"
eventtypes "github.com/containerd/containerd/v2/api/events"
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"

2
internal/cri/server/runtime_config_linux.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"sort"
runcoptions "github.com/containerd/containerd/v2/api/types/runc/options"
runcoptions "github.com/containerd/containerd/api/types/runc/options"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/internal/cri/systemd"
"github.com/containerd/log"

4
internal/cri/server/sandbox_stats_windows.go
View File

@@ -24,8 +24,8 @@ import (
"github.com/Microsoft/hcsshim"
wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
"github.com/Microsoft/hcsshim/hcn"
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/containerd/containerd/v2/internal/cri/store/stats"

2
internal/cri/server/service.go
View File

@@ -34,7 +34,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/kubelet/pkg/cri/streaming"
apitypes "github.com/containerd/containerd/v2/api/types"
apitypes "github.com/containerd/containerd/api/types"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/introspection"
_ "github.com/containerd/containerd/v2/core/runtime" // for typeurl init

2
internal/cri/server/service_test.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/containerd/go-cni"
"github.com/containerd/platforms"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/api/types"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
criconfig "github.com/containerd/containerd/v2/internal/cri/config"

2
internal/cri/server/status.go
View File

@@ -22,7 +22,7 @@ import (
"fmt"
goruntime "runtime"
"github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/api/services/introspection/v1"
"github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

2
internal/cri/server/status_test.go
View File

@@ -19,7 +19,7 @@ package server
import (
"testing"
"github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/api/services/introspection/v1"
"github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)