Fix utility clock import (k3s-io#1)

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
galal-hussein · Nov 22, 2022 · 1c1d558 · 1c1d558
1 parent 2d53763
commit 1c1d558
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/core/docker_service_test.go b/core/docker_service_test.go
@@ -29,9 +29,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/util/clock"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
+	clock "k8s.io/utils/clock/testing"
 
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/Mirantis/cri-dockerd/network"

diff --git a/libdocker/fake_client.go b/libdocker/fake_client.go
@@ -33,7 +33,7 @@ import (
 	dockerimagetypes "github.com/docker/docker/api/types/image"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 type CalledDetail struct {

diff --git a/streaming/request_cache.go b/streaming/request_cache.go
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 var (

diff --git a/streaming/request_cache_test.go b/streaming/request_cache_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"k8s.io/apimachinery/pkg/util/clock"
+	clock "k8s.io/utils/clock/testing"
 )
 
 func TestInsert(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ import ( @@
     	"sync"
     	"time"
-    	"k8s.io/apimachinery/pkg/util/clock"
+    	"k8s.io/utils/clock"
     )
     var (
@@ Expand Down @@