From 077158ef86bb782e8b2952494ce6a12a284cc4d6 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 21 Sep 2015 11:13:46 -0700 Subject: [PATCH] Rebase to use unversioned api --- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/kubelet_test.go | 38 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 6aff034a672..c9ec44238fc 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2346,7 +2346,7 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error { // Check whether network is configured properly networkConfigured := kl.doneNetworkConfigure() - currentTime := util.Now() + currentTime := unversioned.Now() var newNodeReadyCondition api.NodeCondition var oldNodeReadyConditionStatus api.ConditionStatus if containerRuntimeUp && networkConfigured { diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 319cf9ab3cc..d0bf8401829 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2420,8 +2420,8 @@ func TestUpdateNewNodeStatus(t *testing.T) { Status: api.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: util.Time{}, - LastTransitionTime: util.Time{}, + LastHeartbeatTime: unversioned.Time{}, + LastTransitionTime: unversioned.Time{}, }, }, NodeInfo: api.NodeSystemInfo{ @@ -2467,8 +2467,8 @@ func TestUpdateNewNodeStatus(t *testing.T) { if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() { t.Errorf("unexpected zero last transition timestamp") } - updatedNode.Status.Conditions[0].LastHeartbeatTime = util.Time{} - updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} + updatedNode.Status.Conditions[0].LastHeartbeatTime = unversioned.Time{} + updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{} if !reflect.DeepEqual(expectedNode, updatedNode) { t.Errorf("unexpected objects: %s", util.ObjectDiff(expectedNode, updatedNode)) } @@ -2489,8 +2489,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Status: api.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), - LastTransitionTime: util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastTransitionTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, }, Capacity: api.ResourceList{ @@ -2526,8 +2526,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Status: api.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: util.Time{}, // placeholder - LastTransitionTime: util.Time{}, // placeholder + LastHeartbeatTime: unversioned.Time{}, // placeholder + LastTransitionTime: unversioned.Time{}, // placeholder }, }, NodeInfo: api.NodeSystemInfo{ @@ -2569,15 +2569,15 @@ func TestUpdateExistingNodeStatus(t *testing.T) { t.Errorf("unexpected object type") } // Expect LastProbeTime to be updated to Now, while LastTransitionTime to be the same. - if reflect.DeepEqual(updatedNode.Status.Conditions[0].LastHeartbeatTime.Rfc3339Copy().UTC(), util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time) { - t.Errorf("expected \n%v\n, got \n%v", util.Now(), util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)) + if reflect.DeepEqual(updatedNode.Status.Conditions[0].LastHeartbeatTime.Rfc3339Copy().UTC(), unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time) { + t.Errorf("expected \n%v\n, got \n%v", unversioned.Now(), unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)) } - if !reflect.DeepEqual(updatedNode.Status.Conditions[0].LastTransitionTime.Rfc3339Copy().UTC(), util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time) { + if !reflect.DeepEqual(updatedNode.Status.Conditions[0].LastTransitionTime.Rfc3339Copy().UTC(), unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time) { t.Errorf("expected \n%#v\n, got \n%#v", updatedNode.Status.Conditions[0].LastTransitionTime.Rfc3339Copy(), - util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)) + unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)) } - updatedNode.Status.Conditions[0].LastHeartbeatTime = util.Time{} - updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} + updatedNode.Status.Conditions[0].LastHeartbeatTime = unversioned.Time{} + updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{} if !reflect.DeepEqual(expectedNode, updatedNode) { t.Errorf("expected \n%v\n, got \n%v", expectedNode, updatedNode) } @@ -2621,8 +2621,8 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) { Status: api.ConditionFalse, Reason: "KubeletNotReady", Message: fmt.Sprintf("container runtime is down"), - LastHeartbeatTime: util.Time{}, - LastTransitionTime: util.Time{}, + LastHeartbeatTime: unversioned.Time{}, + LastTransitionTime: unversioned.Time{}, }, }, NodeInfo: api.NodeSystemInfo{ @@ -2670,8 +2670,8 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) { if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() { t.Errorf("unexpected zero last transition timestamp") } - updatedNode.Status.Conditions[0].LastHeartbeatTime = util.Time{} - updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} + updatedNode.Status.Conditions[0].LastHeartbeatTime = unversioned.Time{} + updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{} if !reflect.DeepEqual(expectedNode, updatedNode) { t.Errorf("unexpected objects: %s", util.ObjectDiff(expectedNode, updatedNode)) } @@ -3073,7 +3073,7 @@ func TestRegisterExistingNodeWithApiserver(t *testing.T) { kubeClient.AddReactor("create", "nodes", func(action testclient.Action) (bool, runtime.Object, error) { // Return an error on create. return true, &api.Node{}, &apierrors.StatusError{ - ErrStatus: api.Status{Reason: api.StatusReasonAlreadyExists}, + ErrStatus: unversioned.Status{Reason: unversioned.StatusReasonAlreadyExists}, } }) kubeClient.AddReactor("get", "nodes", func(action testclient.Action) (bool, runtime.Object, error) {