pkg/cri: switch to CRI API v1.

intel · Mar 1, 2022 · 25051c8 · 25051c8
1 parent a21a6a6
commit 25051c8
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/pkg/cri/client/client.go b/pkg/cri/client/client.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/intel/cri-resource-manager/pkg/instrumentation"
 	logger "github.com/intel/cri-resource-manager/pkg/log"

diff --git a/pkg/cri/relay/image-service.go b/pkg/cri/relay/image-service.go
@@ -16,7 +16,8 @@ package relay
 
 import (
 	"context"
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (r *relay) ListImages(ctx context.Context,

diff --git a/pkg/cri/relay/runtime-service.go b/pkg/cri/relay/runtime-service.go
@@ -17,7 +17,7 @@ package relay
 import (
 	"context"
 
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/intel/cri-resource-manager/pkg/dump"
 )
@@ -164,8 +164,7 @@ func (r *relay) PodSandboxStats(ctx context.Context,
 }
 
 func (r *relay) ListPodSandboxStats(ctx context.Context,
-	req *api.ListPodSandboxStatsRequest) (*api.ListPodSandboxStatsResponse,
-	error) {
+	req *api.ListPodSandboxStatsRequest) (*api.ListPodSandboxStatsResponse, error) {
 	r.dump("ListPodSandboxStats", req)
 	return r.client.ListPodSandboxStats(ctx, req)
 }

diff --git a/pkg/cri/resource-manager/cache/cache.go b/pkg/cri/resource-manager/cache/cache.go
@@ -26,7 +26,7 @@ import (
 	"sync"
 
 	v1 "k8s.io/api/core/v1"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
 
 	"github.com/intel/cri-resource-manager/pkg/apis/resmgr"

diff --git a/pkg/cri/resource-manager/cache/cache_test.go b/pkg/cri/resource-manager/cache/cache_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 	kubecm "k8s.io/kubernetes/pkg/kubelet/cm"
 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
 

diff --git a/pkg/cri/resource-manager/cache/container.go b/pkg/cri/resource-manager/cache/container.go
@@ -28,7 +28,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	resapi "k8s.io/apimachinery/pkg/api/resource"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	extapi "github.com/intel/cri-resource-manager/pkg/apis/resmgr/v1alpha1"
 )

diff --git a/pkg/cri/resource-manager/cache/pod.go b/pkg/cri/resource-manager/cache/pod.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	v1 "k8s.io/api/core/v1"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/intel/cri-resource-manager/pkg/apis/resmgr"
 	"github.com/intel/cri-resource-manager/pkg/cgroups"

diff --git a/pkg/cri/resource-manager/cache/utils.go b/pkg/cri/resource-manager/cache/utils.go
@@ -24,7 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	resapi "k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/sets"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 	kubecm "k8s.io/kubernetes/pkg/kubelet/cm"
 
 	"github.com/intel/cri-resource-manager/pkg/cgroups"

diff --git a/pkg/cri/resource-manager/control/cri/cri.go b/pkg/cri/resource-manager/control/cri/cri.go
@@ -20,7 +20,7 @@ import (
 	"github.com/intel/cri-resource-manager/pkg/cri/client"
 	"github.com/intel/cri-resource-manager/pkg/cri/resource-manager/cache"
 	"github.com/intel/cri-resource-manager/pkg/cri/resource-manager/control"
-	criapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	criapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	logger "github.com/intel/cri-resource-manager/pkg/log"
 )

diff --git a/pkg/cri/resource-manager/policy/builtin/topology-aware/mocks_test.go b/pkg/cri/resource-manager/policy/builtin/topology-aware/mocks_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/intel/goresctrl/pkg/sst"
 	idset "github.com/intel/goresctrl/pkg/utils"
 	v1 "k8s.io/api/core/v1"
-	cri "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
 )
 

diff --git a/pkg/cri/resource-manager/requests.go b/pkg/cri/resource-manager/requests.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	criapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	criapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	pkgcfg "github.com/intel/cri-resource-manager/pkg/config"
 	"github.com/intel/cri-resource-manager/pkg/cri/resource-manager/cache"

diff --git a/pkg/cri/server/server.go b/pkg/cri/server/server.go
@@ -27,7 +27,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/intel/cri-resource-manager/pkg/cri/resource-manager/sockets"
 	"github.com/intel/cri-resource-manager/pkg/dump"

diff --git a/pkg/cri/server/services.go b/pkg/cri/server/services.go
@@ -20,11 +20,11 @@ import (
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc"
 
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 const (
-	apiVersion = "v1alpha2"
+	apiVersion = "v1"
 
 	imageService = "ImageService"
 	listImages   = "ListImages"

diff --git a/test/functional/e2e_test.go b/test/functional/e2e_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/intel/cri-resource-manager/pkg/cri/resource-manager/cache"
 	"github.com/intel/cri-resource-manager/pkg/dump"
 	"google.golang.org/grpc"
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	logger "github.com/intel/cri-resource-manager/pkg/log"
 )

diff --git a/test/functional/fake_cri_server_test.go b/test/functional/fake_cri_server_test.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/intel/cri-resource-manager/pkg/utils"
 	"google.golang.org/grpc"
-	api "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	api "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 type fakeCriServer struct {