github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Rebase to use unversioned api

Browse Source
This commit is contained in:
Yu-Ju Hong 2015-09-21 11:13:46 -07:00
parent cadc279505
commit 077158ef86
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@ -2346,7 +2346,7 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
// Check whether network is configured properly // Check whether network is configured properly
networkConfigured := kl.doneNetworkConfigure() networkConfigured := kl.doneNetworkConfigure()
currentTime := util.Now() currentTime := unversioned.Now()
var newNodeReadyCondition api.NodeCondition var newNodeReadyCondition api.NodeCondition
var oldNodeReadyConditionStatus api.ConditionStatus var oldNodeReadyConditionStatus api.ConditionStatus
if containerRuntimeUp && networkConfigured { if containerRuntimeUp && networkConfigured {

38
pkg/kubelet/kubelet_test.go
View File

@ -2420,8 +2420,8 @@ func TestUpdateNewNodeStatus(t *testing.T) {
Status: api.ConditionTrue, Status: api.ConditionTrue,
Reason: "KubeletReady", Reason: "KubeletReady",
Message: fmt.Sprintf("kubelet is posting ready status"), Message: fmt.Sprintf("kubelet is posting ready status"),
LastHeartbeatTime: util.Time{}, LastHeartbeatTime: unversioned.Time{},
LastTransitionTime: util.Time{}, LastTransitionTime: unversioned.Time{},
}, },
}, },
NodeInfo: api.NodeSystemInfo{ NodeInfo: api.NodeSystemInfo{
@ -2467,8 +2467,8 @@ func TestUpdateNewNodeStatus(t *testing.T) {
if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() { if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() {
t.Errorf("unexpected zero last transition timestamp") t.Errorf("unexpected zero last transition timestamp")
} }
updatedNode.Status.Conditions[0].LastHeartbeatTime = util.Time{} updatedNode.Status.Conditions[0].LastHeartbeatTime = unversioned.Time{}
updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{}
if !reflect.DeepEqual(expectedNode, updatedNode) { if !reflect.DeepEqual(expectedNode, updatedNode) {
t.Errorf("unexpected objects: %s", util.ObjectDiff(expectedNode, updatedNode)) t.Errorf("unexpected objects: %s", util.ObjectDiff(expectedNode, updatedNode))
} }
@ -2489,8 +2489,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
Status: api.ConditionTrue, Status: api.ConditionTrue,
Reason: "KubeletReady", Reason: "KubeletReady",
Message: fmt.Sprintf("kubelet is posting ready status"), Message: fmt.Sprintf("kubelet is posting ready status"),
LastHeartbeatTime: util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC),
LastTransitionTime: util.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{ Capacity: api.ResourceList{
@ -2526,8 +2526,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
Status: api.ConditionTrue, Status: api.ConditionTrue,
Reason: "KubeletReady", Reason: "KubeletReady",
Message: fmt.Sprintf("kubelet is posting ready status"), Message: fmt.Sprintf("kubelet is posting ready status"),
LastHeartbeatTime: util.Time{}, // placeholder LastHeartbeatTime: unversioned.Time{}, // placeholder
LastTransitionTime: util.Time{}, // placeholder LastTransitionTime: unversioned.Time{}, // placeholder
}, },
}, },
NodeInfo: api.NodeSystemInfo{ NodeInfo: api.NodeSystemInfo{
@ -2569,15 +2569,15 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
t.Errorf("unexpected object type") t.Errorf("unexpected object type")
} }
// Expect LastProbeTime to be updated to Now, while LastTransitionTime to be the same. // 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) { 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", util.Now(), util.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)) 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(), 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].LastHeartbeatTime = unversioned.Time{}
updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{}
if !reflect.DeepEqual(expectedNode, updatedNode) { if !reflect.DeepEqual(expectedNode, updatedNode) {
t.Errorf("expected \n%v\n, got \n%v", 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, Status: api.ConditionFalse,
Reason: "KubeletNotReady", Reason: "KubeletNotReady",
Message: fmt.Sprintf("container runtime is down"), Message: fmt.Sprintf("container runtime is down"),
LastHeartbeatTime: util.Time{}, LastHeartbeatTime: unversioned.Time{},
LastTransitionTime: util.Time{}, LastTransitionTime: unversioned.Time{},
}, },
}, },
NodeInfo: api.NodeSystemInfo{ NodeInfo: api.NodeSystemInfo{
@ -2670,8 +2670,8 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) {
if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() { if updatedNode.Status.Conditions[0].LastTransitionTime.IsZero() {
t.Errorf("unexpected zero last transition timestamp") t.Errorf("unexpected zero last transition timestamp")
} }
updatedNode.Status.Conditions[0].LastHeartbeatTime = util.Time{} updatedNode.Status.Conditions[0].LastHeartbeatTime = unversioned.Time{}
updatedNode.Status.Conditions[0].LastTransitionTime = util.Time{} updatedNode.Status.Conditions[0].LastTransitionTime = unversioned.Time{}
if !reflect.DeepEqual(expectedNode, updatedNode) { if !reflect.DeepEqual(expectedNode, updatedNode) {
t.Errorf("unexpected objects: %s", util.ObjectDiff(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) { kubeClient.AddReactor("create", "nodes", func(action testclient.Action) (bool, runtime.Object, error) {
// Return an error on create. // Return an error on create.
return true, &api.Node{}, &apierrors.StatusError{ 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) { kubeClient.AddReactor("get", "nodes", func(action testclient.Action) (bool, runtime.Object, error) {