Move pkg/util.Time to pkg/api/unversioned.Time

Along with our time.Duration wrapper, as suggested by @lavalamp.

pkg/controller/node/nodecontroller.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/cloudprovider"
@@ -49,8 +50,8 @@ const (
 )
 
 type nodeStatusData struct {
-	probeTimestamp           util.Time
-	readyTransitionTimestamp util.Time
+	probeTimestamp           unversioned.Time
+	readyTransitionTimestamp unversioned.Time
 	status                   api.NodeStatus
 }
 
@@ -89,7 +90,7 @@ type NodeController struct {
 	// This timestamp is to be used instead of LastProbeTime stored in Condition. We do this
 	// to aviod the problem with time skew across the cluster.
 	nodeStatusMap map[string]nodeStatusData
-	now           func() util.Time
+	now           func() unversioned.Time
 	// Lock to access evictor workers
 	evictorLock *sync.Mutex
 	// workers that evicts pods from unresponsive nodes.
@@ -140,7 +141,7 @@ func NewNodeController(
 		nodeMonitorPeriod:      nodeMonitorPeriod,
 		nodeStartupGracePeriod: nodeStartupGracePeriod,
 		lookupIP:               net.LookupIP,
-		now:                    util.Now,
+		now:                    unversioned.Now,
 		clusterCIDR:            clusterCIDR,
 		allocateNodeCIDRs:      allocateNodeCIDRs,
 	}
@@ -488,7 +489,7 @@ func (nc *NodeController) tryUpdateNodeStatus(node *api.Node) (time.Duration, ap
 		}
 		nc.nodeStatusMap[node.Name] = savedNodeStatus
 	} else if savedCondition != nil && observedCondition != nil && savedCondition.LastHeartbeatTime != observedCondition.LastHeartbeatTime {
-		var transitionTime util.Time
+		var transitionTime unversioned.Time
 		// If ReadyCondition changed since the last time we checked, we update the transition timestamp to "now",
 		// otherwise we leave it as it is.
 		if savedCondition.LastTransitionTime != observedCondition.LastTransitionTime {