github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

some manual fixes

Browse Source
This commit is contained in:
Mike Danese
2019-12-17 00:01:53 -08:00
parent 9443a38144
commit 2637772298
18 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/controller/nodelifecycle/node_lifecycle_controller_test.go
View File

@@ -135,7 +135,7 @@ func (nc *nodeLifecycleController) syncLeaseStore(lease *coordv1.Lease) error {
}
func (nc *nodeLifecycleController) syncNodeStore(fakeNodeHandler *testutil.FakeNodeHandler) error {
nodes, err := fakeNodeHandler.List(metav1.ListOptions{})
nodes, err := fakeNodeHandler.List(context.TODO(), metav1.ListOptions{})
if err != nil {
return err
}
@@ -2740,7 +2740,7 @@ func TestApplyNoExecuteTaints(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
nodeController.doNoExecuteTaintingPass()
node0, err := fakeNodeHandler.Get("node0", metav1.GetOptions{})
node0, err := fakeNodeHandler.Get(context.TODO(), "node0", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node0...")
return
@@ -2748,7 +2748,7 @@ func TestApplyNoExecuteTaints(t *testing.T) {
if !taintutils.TaintExists(node0.Spec.Taints, UnreachableTaintTemplate) {
t.Errorf("Can't find taint %v in %v", originalTaint, node0.Spec.Taints)
}
node2, err := fakeNodeHandler.Get("node2", metav1.GetOptions{})
node2, err := fakeNodeHandler.Get(context.TODO(), "node2", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node2...")
return
@@ -2759,7 +2759,7 @@ func TestApplyNoExecuteTaints(t *testing.T) {
// Make node3 healthy again.
node2.Status = healthyNodeNewStatus
_, err = fakeNodeHandler.UpdateStatus(node2)
_, err = fakeNodeHandler.UpdateStatus(context.TODO(), node2)
if err != nil {
t.Errorf(err.Error())
return
@@ -2772,7 +2772,7 @@ func TestApplyNoExecuteTaints(t *testing.T) {
}
nodeController.doNoExecuteTaintingPass()
node2, err = fakeNodeHandler.Get("node2", metav1.GetOptions{})
node2, err = fakeNodeHandler.Get(context.TODO(), "node2", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node2...")
return
@@ -2886,12 +2886,12 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) {
}
nodeController.doNoExecuteTaintingPass()
node0, err := fakeNodeHandler.Get("node0", metav1.GetOptions{})
node0, err := fakeNodeHandler.Get(context.TODO(), "node0", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node0...")
return
}
node1, err := fakeNodeHandler.Get("node1", metav1.GetOptions{})
node1, err := fakeNodeHandler.Get(context.TODO(), "node1", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node1...")
return
@@ -2905,12 +2905,12 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) {
node0.Status = newNodeStatus
node1.Status = healthyNodeNewStatus
_, err = fakeNodeHandler.UpdateStatus(node0)
_, err = fakeNodeHandler.UpdateStatus(context.TODO(), node0)
if err != nil {
t.Errorf(err.Error())
return
}
_, err = fakeNodeHandler.UpdateStatus(node1)
_, err = fakeNodeHandler.UpdateStatus(context.TODO(), node1)
if err != nil {
t.Errorf(err.Error())
return
@@ -2924,7 +2924,7 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) {
}
nodeController.doNoExecuteTaintingPass()
node0, err = fakeNodeHandler.Get("node0", metav1.GetOptions{})
node0, err = fakeNodeHandler.Get(context.TODO(), "node0", metav1.GetOptions{})
if err != nil {
t.Errorf("Can't get current node0...")
return
@@ -3120,7 +3120,7 @@ func TestTaintsNodeByCondition(t *testing.T) {
}
for _, test := range tests {
fakeNodeHandler.Update(test.Node)
fakeNodeHandler.Update(context.TODO(), test.Node)
if err := nodeController.syncNodeStore(fakeNodeHandler); err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -3331,7 +3331,7 @@ func TestReconcileNodeLabels(t *testing.T) {
}
for _, test := range tests {
fakeNodeHandler.Update(test.Node)
fakeNodeHandler.Update(context.TODO(), test.Node)
if err := nodeController.syncNodeStore(fakeNodeHandler); err != nil {
t.Fatalf("unexpected error: %v", err)
}