cleanup: import from k8s.io/utils/clock instead

jonyhy96 · jonyhy96 · commit 6484fab1e020 · 2021-09-30T23:27:20.000+08:00
Signed-off-by: haoyun &lt;yun.hao@daocloud.io&gt;
diff --git a/go.mod b/go.mod
@@ -73,7 +73,7 @@ require (
 	k8s.io/component-base v0.22.0
 	k8s.io/cri-api v0.22.0
 	k8s.io/klog/v2 v2.9.0
-	k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 )
 
 // When updating replace rules, make sure to also update the rules in integration/client/go.mod and api/go.mod
diff --git a/go.sum b/go.sum
@@ -936,8 +936,9 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
-k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 h1:imL9YgXQ9p7xmPzHFm/vVd/cF78jad+n4wK1ABwYtMM=
 k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/integration/client/go.sum b/integration/client/go.sum
@@ -872,6 +872,7 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/pkg/cri/streaming/request_cache.go b/pkg/cri/streaming/request_cache.go
@@ -41,7 +41,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 var (
diff --git a/vendor/k8s.io/utils/clock/README.md b/vendor/k8s.io/utils/clock/README.md
diff --git a/vendor/k8s.io/utils/clock/clock.go b/vendor/k8s.io/utils/clock/clock.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -682,8 +682,9 @@ k8s.io/cri-api/pkg/apis/runtime/v1alpha2
 # k8s.io/klog/v2 v2.9.0
 ## explicit
 k8s.io/klog/v2
-# k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
+# k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 ## explicit
+k8s.io/utils/clock
 k8s.io/utils/exec
 k8s.io/utils/integer
 # sigs.k8s.io/structured-merge-diff/v4 v4.1.2

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ require (`
`73`	`73`	`k8s.io/component-base v0.22.0`
`74`	`74`	`k8s.io/cri-api v0.22.0`
`75`	`75`	`k8s.io/klog/v2 v2.9.0`
`76`		`- k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9`
	`76`	`+ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b`
`77`	`77`	`)`
`78`	`78`
`79`	`79`	`// When updating replace rules, make sure to also update the rules in integration/client/go.mod and api/go.mod`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ import (`
`41`	`41`	`"sync"`
`42`	`42`	`"time"`
`43`	`43`
`44`		`- "k8s.io/apimachinery/pkg/util/clock"`
	`44`	`+ "k8s.io/utils/clock"`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`var (`