Merge pull request #52 from andyxning/bump_kubernetes_to_v1.4.0-beta.3

bump kubernetes version to v1.4.0-beta.3

Author: Random-Liu

Godeps/Godeps.json

@@ -26,7 +26,7 @@ import (
 problemutil "k8s.io/node-problem-detector/pkg/util"
 
 "k8s.io/kubernetes/pkg/api"
-"k8s.io/kubernetes/pkg/util"
+"k8s.io/kubernetes/pkg/util/clock"
 
 "github.com/golang/glog"
 )
@@ -58,15 +58,15 @@ type ConditionManager interface {
 
 type conditionManager struct {
 sync.Mutex
-clock util.Clock
+clock clock.Clock
 latest time.Time
 client problemclient.Client
 updates map[string]types.Condition
 conditions map[string]types.Condition
 }
 
 // NewConditionManager creates a condition manager.
-func NewConditionManager(client problemclient.Client, clock util.Clock) ConditionManager {
+func NewConditionManager(client problemclient.Client, clock clock.Clock) ConditionManager {
 return &conditionManager{
 client: client,
 clock: clock,

pkg/condition/manager.go

@@ -27,12 +27,12 @@ import (
 problemutil "k8s.io/node-problem-detector/pkg/util"
 
 "k8s.io/kubernetes/pkg/api"
-"k8s.io/kubernetes/pkg/util"
+"k8s.io/kubernetes/pkg/util/clock"
 )
 
-func newTestManager() (*conditionManager, *problemclient.FakeProblemClient, *util.FakeClock) {
+func newTestManager() (*conditionManager, *problemclient.FakeProblemClient, *clock.FakeClock) {
 fakeClient := problemclient.NewFakeProblemClient()
-fakeClock := util.NewFakeClock(time.Now())
+fakeClock := clock.NewFakeClock(time.Now())
 manager := NewConditionManager(fakeClient, fakeClock)
 return manager.(*conditionManager), fakeClient, fakeClock
 }

pkg/condition/manager_test.go

@@ -29,10 +29,10 @@ import (
 "k8s.io/node-problem-detector/pkg/kernelmonitor/types"
 "k8s.io/node-problem-detector/pkg/kernelmonitor/util"
 
+utilclock "code.cloudfoundry.org/clock"
 "github.com/coreos/go-systemd/sdjournal"
 "github.com/golang/glog"
 "github.com/google/cadvisor/utils/tail"
-utilclock "github.com/pivotal-golang/clock"
 )
 
 const (

pkg/kernelmonitor/kernel_log_watcher.go

@@ -25,7 +25,7 @@ import (
 
 "k8s.io/node-problem-detector/pkg/kernelmonitor/types"
 
-"github.com/pivotal-golang/clock/fakeclock"
+"code.cloudfoundry.org/clock/fakeclock"
 )
 
 func TestWatch(t *testing.T) {

pkg/kernelmonitor/kernel_log_watcher_test.go

@@ -21,13 +21,14 @@ import (
 "fmt"
 "os"
 
+"k8s.io/kubernetes/pkg/util/clock"
+
 "k8s.io/kubernetes/pkg/api"
 "k8s.io/kubernetes/pkg/api/unversioned"
 "k8s.io/kubernetes/pkg/client/record"
 "k8s.io/kubernetes/pkg/client/restclient"
 client "k8s.io/kubernetes/pkg/client/unversioned"
 "k8s.io/kubernetes/pkg/types"
-"k8s.io/kubernetes/pkg/util"
 )
 
 // Client is the interface of problem client
@@ -43,14 +44,14 @@ type Client interface {
 type nodeProblemClient struct {
 nodeName string
 client *client.Client
-clock util.Clock
+clock clock.Clock
 recorders map[string]record.EventRecorder
 nodeRef *api.ObjectReference
 }
 
 // NewClientOrDie creates a new problem client, panics if error occurs.
 func NewClientOrDie() Client {
-c := &nodeProblemClient{clock: util.RealClock{}}
+c := &nodeProblemClient{clock: clock.RealClock{}}
 cfg, err := restclient.InClusterConfig()
 if err != nil {
 panic(err)

pkg/problemclient/problem_client.go

@@ -25,7 +25,7 @@ import (
 "k8s.io/kubernetes/pkg/api"
 "k8s.io/kubernetes/pkg/api/unversioned"
 "k8s.io/kubernetes/pkg/client/record"
-"k8s.io/kubernetes/pkg/util"
+"k8s.io/kubernetes/pkg/util/clock"
 
 "github.com/stretchr/testify/assert"
 )
@@ -40,7 +40,7 @@ func newFakeProblemClient() *nodeProblemClient {
 nodeName: testNode,
 // There is no proper fake for *client.Client for now
 // TODO(random-liu): Add test for SetConditions when we have good fake for *client.Client
-clock: &util.FakeClock{},
+clock: &clock.FakeClock{},
 recorders: make(map[string]record.EventRecorder),
 nodeRef: getNodeRef(testNode),
 }

pkg/problemclient/problem_client_test.go

@@ -19,7 +19,7 @@ package problemdetector
 import (
 "github.com/golang/glog"
 
-kubeutil "k8s.io/kubernetes/pkg/util"
+"k8s.io/kubernetes/pkg/util/clock"
 
 "k8s.io/node-problem-detector/pkg/condition"
 "k8s.io/node-problem-detector/pkg/kernelmonitor"
@@ -45,7 +45,7 @@ func NewProblemDetector(monitor kernelmonitor.KernelMonitor) ProblemDetector {
 client := problemclient.NewClientOrDie()
 return &problemDetector{
 client: client,
-conditionManager: condition.NewConditionManager(client, kubeutil.RealClock{}),
+conditionManager: condition.NewConditionManager(client, clock.RealClock{}),
 monitor: monitor,
 }
 }