Fix utility clock import (Mirantis#1)

Signed-off-by: galal-hussein <[email protected]>
brandond · Jan 20, 2023 · 18c40d7 · 18c40d7
1 parent 3c5fedf
commit 18c40d7
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 91 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/v1"
 	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) {

diff --git a/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go b/vendor/k8s.io/apimachinery/pkg/util/clock/clock.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -694,7 +694,6 @@ k8s.io/apimachinery/pkg/runtime/serializer/versioning
 k8s.io/apimachinery/pkg/selection
 k8s.io/apimachinery/pkg/types
 k8s.io/apimachinery/pkg/util/cache
-k8s.io/apimachinery/pkg/util/clock
 k8s.io/apimachinery/pkg/util/diff
 k8s.io/apimachinery/pkg/util/errors
 k8s.io/apimachinery/pkg/util/framer