Merge pull request google#1817 from dashpole/util_clock

Switch from apimachinery clock to k8s.io/utils/clock
163yun · Nov 22, 2017 · e420065 · e420065
2 parents 5831d72 + 3166cda
commit e420065
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 126 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/manager/container.go b/manager/container.go
@@ -40,8 +40,7 @@ import (
 
 	units "github.com/docker/go-units"
 	"github.com/golang/glog"
-
-	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 // Housekeeping interval.

diff --git a/manager/container_test.go b/manager/container_test.go
@@ -34,8 +34,7 @@ import (
 	"github.com/mindprince/gonvml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"k8s.io/apimachinery/pkg/util/clock"
+	clock "k8s.io/utils/clock/testing"
 )
 
 const (

diff --git a/manager/manager.go b/manager/manager.go
@@ -50,7 +50,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/utils/clock"
 )
 
 var globalHousekeepingInterval = flag.Duration("global_housekeeping_interval", 1*time.Minute, "Interval between global housekeepings")

diff --git a/manager/manager_test.go b/manager/manager_test.go
@@ -34,8 +34,9 @@ import (
 	itest "github.com/google/cadvisor/info/v1/test"
 	"github.com/google/cadvisor/info/v2"
 	"github.com/google/cadvisor/utils/sysfs/fakesysfs"
+
 	"github.com/stretchr/testify/assert"
-	"k8s.io/apimachinery/pkg/util/clock"
+	clock "k8s.io/utils/clock/testing"
 )
 
 // TODO(vmarmol): Refactor these tests.

diff --git a/vendor/k8s.io/apimachinery/pkg/util/clock/BUILD b/vendor/k8s.io/apimachinery/pkg/util/clock/BUILD
diff --git a/vendor/k8s.io/apimachinery/LICENSE → vendor/k8s.io/utils/LICENSE b/vendor/k8s.io/apimachinery/LICENSE → vendor/k8s.io/utils/LICENSE
diff --git a/vendor/k8s.io/utils/clock/clock.go b/vendor/k8s.io/utils/clock/clock.go
diff --git a/...s.io/apimachinery/pkg/util/clock/clock.go → .../k8s.io/utils/clock/testing/fake_clock.go b/...s.io/apimachinery/pkg/util/clock/clock.go → .../k8s.io/utils/clock/testing/fake_clock.go