github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Replace context.TODO with proper context

Browse Source
This commit is contained in:
Maciej Szulik 2023-03-06 12:41:59 +01:00
parent 1692de5f17
commit 17117dc47d
No known key found for this signature in database
GPG Key ID: F15E55D276FA84C4
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/apps/statefulset.go
View File

@ -1385,7 +1385,7 @@ var _ = SIGDescribe("StatefulSet", func() {
ss.Spec.Template.Spec.NodeSelector = map[string]string{hostLabel: hostLabelVal} // force the pod on a specific node ss.Spec.Template.Spec.NodeSelector = map[string]string{hostLabel: hostLabelVal} // force the pod on a specific node
ginkgo.By("Creating statefulset " + ssName + " in namespace " + ns) ginkgo.By("Creating statefulset " + ssName + " in namespace " + ns)
_, err = c.AppsV1().StatefulSets(ns).Create(context.TODO(), ss, metav1.CreateOptions{}) _, err = c.AppsV1().StatefulSets(ns).Create(ctx, ss, metav1.CreateOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
ginkgo.By("Confirming PVC exists") ginkgo.By("Confirming PVC exists")
@ -1395,12 +1395,12 @@ var _ = SIGDescribe("StatefulSet", func() {
ginkgo.By("Confirming Pod is ready") ginkgo.By("Confirming Pod is ready")
e2estatefulset.WaitForStatusReadyReplicas(ctx, c, ss, 1) e2estatefulset.WaitForStatusReadyReplicas(ctx, c, ss, 1)
podName := getStatefulSetPodNameAtIndex(0, ss) podName := getStatefulSetPodNameAtIndex(0, ss)
pod, err := c.CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{}) pod, err := c.CoreV1().Pods(ns).Get(ctx, podName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
nodeName := pod.Spec.NodeName nodeName := pod.Spec.NodeName
framework.ExpectEqual(nodeName, readyNode.Name) framework.ExpectEqual(nodeName, readyNode.Name)
node, err := c.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{}) node, err := c.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
oldData, err := json.Marshal(node) oldData, err := json.Marshal(node)
@ -1415,38 +1415,38 @@ var _ = SIGDescribe("StatefulSet", func() {
patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Node{}) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Node{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
ginkgo.By("Cordoning Node") ginkgo.By("Cordoning Node")
_, err = c.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}) _, err = c.CoreV1().Nodes().Patch(ctx, nodeName, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
cordoned := true cordoned := true
defer func() { defer func() {
if cordoned { if cordoned {
uncordonNode(c, oldData, newData, nodeName) uncordonNode(ctx, c, oldData, newData, nodeName)
} }
}() }()
// wait for the node to be unschedulable // wait for the node to be unschedulable
e2enode.WaitForNodeSchedulable(c, nodeName, 10*time.Second, false) e2enode.WaitForNodeSchedulable(ctx, c, nodeName, 10*time.Second, false)
ginkgo.By("Deleting Pod") ginkgo.By("Deleting Pod")
err = c.CoreV1().Pods(ns).Delete(context.TODO(), podName, metav1.DeleteOptions{}) err = c.CoreV1().Pods(ns).Delete(ctx, podName, metav1.DeleteOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
// wait for the pod to be recreated // wait for the pod to be recreated
e2estatefulset.WaitForStatusCurrentReplicas(c, ss, 1) e2estatefulset.WaitForStatusCurrentReplicas(c, ss, 1)
_, err = c.CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{}) _, err = c.CoreV1().Pods(ns).Get(ctx, podName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
pvcList, err := c.CoreV1().PersistentVolumeClaims(ns).List(context.TODO(), metav1.ListOptions{LabelSelector: klabels.Everything().String()}) pvcList, err := c.CoreV1().PersistentVolumeClaims(ns).List(ctx, metav1.ListOptions{LabelSelector: klabels.Everything().String()})
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectEqual(len(pvcList.Items), 1) framework.ExpectEqual(len(pvcList.Items), 1)
pvcName := pvcList.Items[0].Name pvcName := pvcList.Items[0].Name
ginkgo.By("Deleting PVC") ginkgo.By("Deleting PVC")
err = c.CoreV1().PersistentVolumeClaims(ns).Delete(context.TODO(), pvcName, metav1.DeleteOptions{}) err = c.CoreV1().PersistentVolumeClaims(ns).Delete(ctx, pvcName, metav1.DeleteOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
uncordonNode(c, oldData, newData, nodeName) uncordonNode(ctx, c, oldData, newData, nodeName)
cordoned = false cordoned = false
ginkgo.By("Confirming PVC recreated") ginkgo.By("Confirming PVC recreated")
@ -1455,19 +1455,19 @@ var _ = SIGDescribe("StatefulSet", func() {
ginkgo.By("Confirming Pod is ready after being recreated") ginkgo.By("Confirming Pod is ready after being recreated")
e2estatefulset.WaitForStatusReadyReplicas(ctx, c, ss, 1) e2estatefulset.WaitForStatusReadyReplicas(ctx, c, ss, 1)
pod, err = c.CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{}) pod, err = c.CoreV1().Pods(ns).Get(ctx, podName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectEqual(pod.Spec.NodeName, readyNode.Name) // confirm the pod was scheduled back to the original node framework.ExpectEqual(pod.Spec.NodeName, readyNode.Name) // confirm the pod was scheduled back to the original node
}) })
}) })
}) })
func uncordonNode(c clientset.Interface, oldData, newData []byte, nodeName string) { func uncordonNode(ctx context.Context, c clientset.Interface, oldData, newData []byte, nodeName string) {
ginkgo.By("Uncordoning Node") ginkgo.By("Uncordoning Node")
// uncordon node, by reverting patch // uncordon node, by reverting patch
revertPatchBytes, err := strategicpatch.CreateTwoWayMergePatch(newData, oldData, v1.Node{}) revertPatchBytes, err := strategicpatch.CreateTwoWayMergePatch(newData, oldData, v1.Node{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
_, err = c.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.StrategicMergePatchType, revertPatchBytes, metav1.PatchOptions{}) _, err = c.CoreV1().Nodes().Patch(ctx, nodeName, types.StrategicMergePatchType, revertPatchBytes, metav1.PatchOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }

4
test/e2e/framework/node/wait.go
View File

@ -143,10 +143,10 @@ func WaitForNodeToBeReady(ctx context.Context, c clientset.Interface, name strin
return WaitConditionToBe(ctx, c, name, v1.NodeReady, true, timeout) return WaitConditionToBe(ctx, c, name, v1.NodeReady, true, timeout)
} }
func WaitForNodeSchedulable(c clientset.Interface, name string, timeout time.Duration, wantSchedulable bool) bool { func WaitForNodeSchedulable(ctx context.Context, c clientset.Interface, name string, timeout time.Duration, wantSchedulable bool) bool {
framework.Logf("Waiting up to %v for node %s to be schedulable: %t", timeout, name, wantSchedulable) framework.Logf("Waiting up to %v for node %s to be schedulable: %t", timeout, name, wantSchedulable)
for start := time.Now(); time.Since(start) < timeout; time.Sleep(poll) { for start := time.Now(); time.Since(start) < timeout; time.Sleep(poll) {
node, err := c.CoreV1().Nodes().Get(context.TODO(), name, metav1.GetOptions{}) node, err := c.CoreV1().Nodes().Get(ctx, name, metav1.GetOptions{})
if err != nil { if err != nil {
framework.Logf("Couldn't get node %s", name) framework.Logf("Couldn't get node %s", name)
continue continue