Update to v1.26.0-rc.0

Signed-off-by: galal-hussein <[email protected]>

backend/daemon.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/kubernetes/pkg/kubelet/util"
 
 	"github.com/Mirantis/cri-dockerd/core"

cmd/server.go

@@ -31,7 +31,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 const (

core/container_attach.go

@@ -18,9 +18,10 @@ package core
 
 import (
 	"context"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/Mirantis/cri-dockerd/streaming"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // Attach prepares a streaming endpoint to attach to a running container, and returns the address.
@@ -37,4 +38,3 @@ func (ds *dockerService) Attach(
 	}
 	return ds.streamingServer.GetAttach(req)
 }
-

core/container_create.go

@@ -19,12 +19,13 @@ package core
 import (
 	"context"
 	"fmt"
+	"path/filepath"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/strslice"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-	"path/filepath"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // CreateContainer creates a new container in the given PodSandbox
@@ -159,4 +160,3 @@ func (ds *dockerService) CreateContainer(
 
 	return nil, createErr
 }
-

core/container_exec.go

@@ -20,12 +20,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/Mirantis/cri-dockerd/streaming"
 	"github.com/Mirantis/cri-dockerd/utils"
 	"google.golang.org/grpc/codes"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-	"time"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // ExecSync executes a command in the container, and returns the stdout output.
@@ -79,4 +80,3 @@ func (ds *dockerService) Exec(
 	}
 	return ds.streamingServer.GetExec(req)
 }
-

core/container_list.go

@@ -18,10 +18,11 @@ package core
 
 import (
 	"context"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // ListContainers lists all containers matching the filter.

core/container_remove.go

@@ -19,10 +19,11 @@ package core
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/docker/docker/api/types"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-	"time"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // RemoveContainer removes the container.
@@ -92,4 +93,4 @@ func getContainerTimestamps(r *types.ContainerJSON) (time.Time, time.Time, time.
 		return createdAt, startedAt, finishedAt, err
 	}
 	return createdAt, startedAt, finishedAt, nil
-}
+}

core/container_start.go

@@ -19,7 +19,8 @@ package core
 import (
 	"context"
 	"fmt"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // StartContainer starts the container.
@@ -58,4 +59,3 @@ func transformStartContainerError(err error) error {
 	}
 	return err
 }
-

core/container_status.go

@@ -19,9 +19,10 @@ package core
 import (
 	"context"
 	"fmt"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // ContainerStatus inspects the docker container and returns the status.
@@ -138,4 +139,3 @@ func (ds *dockerService) ContainerStatus(
 	}
 	return &v1.ContainerStatusResponse{Status: status}, nil
 }
-

core/container_stop.go

@@ -18,8 +18,9 @@ package core
 
 import (
 	"context"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 	"time"
+
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // StopContainer stops a running container with a grace period (i.e., timeout).
@@ -33,4 +34,3 @@ func (ds *dockerService) StopContainer(
 	}
 	return &v1.StopContainerResponse{}, nil
 }
-

core/container_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )
 

core/container_update_resources.go

@@ -19,8 +19,9 @@ package core
 import (
 	"context"
 	"fmt"
+
 	"github.com/docker/docker/api/types/container"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (ds *dockerService) UpdateContainerResources(
@@ -45,4 +46,3 @@ func (ds *dockerService) UpdateContainerResources(
 	}
 	return &v1.UpdateContainerResourcesResponse{}, nil
 }
-

core/convert.go

@@ -26,7 +26,7 @@ import (
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerimagetypes "github.com/docker/docker/api/types/image"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	digest "github.com/opencontainers/go-digest"
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"

core/convert_test.go

@@ -22,7 +22,7 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/stretchr/testify/assert"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) {

core/docker_service.go

@@ -42,7 +42,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	v1 "k8s.io/api/core/v1"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 const (
@@ -452,3 +452,18 @@ func (ds *dockerService) getDockerVersionFromCache() (*dockertypes.Version, erro
 	}
 	return dv, nil
 }
+
+func (ds *dockerService) CheckpointContainer(ctx context.Context, options *runtimeapi.CheckpointContainerRequest) (*runtimeapi.CheckpointContainerResponse, error) {
+	return nil, nil
+}
+func (ds *dockerService) GetContainerEvents(eventReq *runtimeapi.GetEventsRequest, containerEventServer runtimeapi.RuntimeService_GetContainerEventsServer) error {
+	return nil
+}
+
+func (ds *dockerService) ListMetricDescriptors(ctx context.Context, s *runtimeapi.ListMetricDescriptorsRequest) (*runtimeapi.ListMetricDescriptorsResponse, error) {
+	return nil, nil
+}
+
+func (ds *dockerService) ListPodSandboxMetrics(ctx context.Context, s *runtimeapi.ListPodSandboxMetricsRequest) (*runtimeapi.ListPodSandboxMetricsResponse, error) {
+	return nil, nil
+}

core/docker_service_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 	clock "k8s.io/utils/clock/testing"
 

core/helpers_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
@@ -20,11 +21,12 @@ package core
 
 import (
 	"fmt"
+
 	"github.com/blang/semver"
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	"github.com/sirupsen/logrus"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // DefaultMemorySwap always returns 0 for no memory swap in a sandbox

core/helpers_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func TestLabelsAndAnnotationsRoundTrip(t *testing.T) {

core/helpers_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 /*
@@ -24,7 +25,7 @@ import (
 	"github.com/blang/semver"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/sirupsen/logrus"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // DefaultMemorySwap always returns -1 for no memory swap in a sandbox

core/helpers_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
@@ -28,11 +29,11 @@ import (
 	"runtime"
 
 	"github.com/blang/semver"
-    "github.com/sirupsen/logrus"
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerfilters "github.com/docker/docker/api/types/filters"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	"github.com/sirupsen/logrus"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // DefaultMemorySwap always returns 0 for no memory swap in a sandbox

core/image.go

@@ -28,7 +28,7 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 
 	"github.com/sirupsen/logrus"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/Mirantis/cri-dockerd/libdocker"
 )

core/image_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
@@ -26,7 +27,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // ImageFsInfo returns information of the filesystem that is used to store images.

core/image_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/Mirantis/cri-dockerd/libdocker"
 )

core/image_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 /*
@@ -22,7 +23,7 @@ import (
 	"context"
 	"fmt"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // ImageFsInfo returns information of the filesystem that is used to store images.

core/image_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*
@@ -24,7 +25,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/kubernetes/pkg/kubelet/winstats"
 )
 

core/logs.go

@@ -34,7 +34,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubetypes "k8s.io/apimachinery/pkg/types"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/Mirantis/cri-dockerd/libdocker"
 )

core/naming.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/Mirantis/cri-dockerd/config"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // Container "names" are implementation details that do not concern

core/naming_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func TestSandboxNameRoundTrip(t *testing.T) {