github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

incorporate review comments

Browse Source 
Signed-off-by: Ashutosh Kumar <sonasingh46@gmail.com>
This commit is contained in:
Ashutosh Kumar 2022-08-16 21:28:58 +05:30
parent 707d50d806
commit 08bd22670f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/pod/wait.go
View File

@ -591,12 +591,6 @@ func WaitForPodsWithLabelRunningReady(c clientset.Interface, ns string, label la
return WaitForAllPodsCondition(c, ns, opts, 1, "running and ready", podListTimeout, testutils.PodRunningReady) return WaitForAllPodsCondition(c, ns, opts, 1, "running and ready", podListTimeout, testutils.PodRunningReady)
} }
// WaitForPodsWithListOptionsRunningReady waits for exact amount of matching pods as per list options to become running and ready.
// Return the list of matching pods.
func WaitForPodsWithListOptionsRunningReady(c clientset.Interface, opts metav1.ListOptions, ns string, minPod int) (pods *v1.PodList, err error) {
return WaitForAllPodsCondition(c, ns, opts, minPod, "running and ready", podListTimeout, testutils.PodRunningReady)
}
// WaitForNRestartablePods tries to list restarting pods using ps until it finds expect of them, // WaitForNRestartablePods tries to list restarting pods using ps until it finds expect of them,
// returning their names if it can do so before timeout. // returning their names if it can do so before timeout.
func WaitForNRestartablePods(ps *testutils.PodStore, expect int, timeout time.Duration) ([]string, error) { func WaitForNRestartablePods(ps *testutils.PodStore, expect int, timeout time.Duration) ([]string, error) {

3
test/e2e/storage/non_graceful_node_shutdown.go
View File

@ -35,6 +35,7 @@ import (
"k8s.io/kubernetes/test/e2e/storage/drivers" "k8s.io/kubernetes/test/e2e/storage/drivers"
storageframework "k8s.io/kubernetes/test/e2e/storage/framework" storageframework "k8s.io/kubernetes/test/e2e/storage/framework"
"k8s.io/kubernetes/test/e2e/storage/utils" "k8s.io/kubernetes/test/e2e/storage/utils"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
) )
@ -117,7 +118,7 @@ var _ = utils.SIGDescribe("[Feature:NodeOutOfServiceVolumeDetach] [Disruptive] [
LabelSelector: labelSelectorStr, LabelSelector: labelSelectorStr,
FieldSelector: fields.OneTermNotEqualSelector("spec.nodeName", oldNodeName).String(), FieldSelector: fields.OneTermNotEqualSelector("spec.nodeName", oldNodeName).String(),
} }
_, err = e2epod.WaitForPodsWithListOptionsRunningReady(c, podListOpts, ns, 1) _, err = e2epod.WaitForAllPodsCondition(c, ns, podListOpts, 1, "running and ready", framework.PodListTimeout, testutils.PodRunningReady)
framework.ExpectNoError(err) framework.ExpectNoError(err)
// Bring the node back online and remove the taint // Bring the node back online and remove the taint