move up to CRI v1 and support v1alpha in parallel

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-06-17 13:59:22 -05:00
parent ba70277fb7
commit a5c417ac06
110 changed files with 36526 additions and 112 deletions
--- a/integration/remote/remote_image.go
+++ b/integration/remote/remote_image.go
@@ -41,8 +41,8 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"

-	internalapi "k8s.io/cri-api/pkg/apis"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"

 	"github.com/containerd/containerd/integration/remote/util"
 )
--- a/integration/remote/remote_runtime.go
+++ b/integration/remote/remote_runtime.go
@@ -42,9 +42,9 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"

+	internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
 	"k8s.io/component-base/logs/logreduction"
-	internalapi "k8s.io/cri-api/pkg/apis"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	utilexec "k8s.io/utils/exec"

 	"github.com/containerd/containerd/integration/remote/util"
--- a/integration/remote/utils.go
+++ b/integration/remote/utils.go
@@ -37,7 +37,7 @@ import (
 	"fmt"
 	"time"

-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

 // maxMsgSize use 16MB as the default message size limit.