mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-26 00:00:23 +00:00
rebase: replace deprecated PollImmediate()
with `PollUntilContextTimeout()
Kubernetes 1.27 deprecates `PollImmediate()`, and golangci-lint complains about the usage of the deprecated function. Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
parent
e6627198d4
commit
2884b0dde7
@ -102,7 +102,7 @@ func createCephfsStorageClass(
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
||||||
|
@ -93,7 +93,7 @@ func deleteDeploymentApp(clientSet kubernetes.Interface, name, ns string, deploy
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting for deployment %q to be deleted", name)
|
framework.Logf("Waiting for deployment %q to be deleted", name)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err := clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
_, err := clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
@ -117,7 +117,7 @@ func waitForDeploymentInAvailableState(clientSet kubernetes.Interface, name, ns
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %q to be in Available state", name)
|
framework.Logf("Waiting up to %q to be in Available state", name)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
d, err := clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
d, err := clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
@ -144,7 +144,7 @@ func waitForDeploymentComplete(clientSet kubernetes.Interface, name, ns string,
|
|||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
err = wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
deployment, err = clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
deployment, err = clientSet.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
@ -310,7 +310,7 @@ func waitForDeploymentUpdateScale(
|
|||||||
) error {
|
) error {
|
||||||
t := time.Duration(timeout) * time.Minute
|
t := time.Duration(timeout) * time.Minute
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
err := wait.PollImmediate(poll, t, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
scaleResult, upsErr := c.AppsV1().Deployments(ns).UpdateScale(context.TODO(),
|
scaleResult, upsErr := c.AppsV1().Deployments(ns).UpdateScale(context.TODO(),
|
||||||
deploymentName, scale, metav1.UpdateOptions{})
|
deploymentName, scale, metav1.UpdateOptions{})
|
||||||
if upsErr != nil {
|
if upsErr != nil {
|
||||||
@ -346,7 +346,7 @@ func waitForDeploymentUpdate(
|
|||||||
) error {
|
) error {
|
||||||
t := time.Duration(timeout) * time.Minute
|
t := time.Duration(timeout) * time.Minute
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
err := wait.PollImmediate(poll, t, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
_, upErr := c.AppsV1().Deployments(deployment.Namespace).Update(
|
_, upErr := c.AppsV1().Deployments(deployment.Namespace).Update(
|
||||||
context.TODO(), deployment, metav1.UpdateOptions{})
|
context.TODO(), deployment, metav1.UpdateOptions{})
|
||||||
if upErr != nil {
|
if upErr != nil {
|
||||||
@ -456,7 +456,7 @@ func waitForContainersArgsUpdate(
|
|||||||
// wait for scale to become count
|
// wait for scale to become count
|
||||||
t := time.Duration(timeout) * time.Minute
|
t := time.Duration(timeout) * time.Minute
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
err = wait.PollImmediate(poll, t, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
deploy, getErr := c.AppsV1().Deployments(ns).Get(context.TODO(), deploymentName, metav1.GetOptions{})
|
deploy, getErr := c.AppsV1().Deployments(ns).Get(context.TODO(), deploymentName, metav1.GetOptions{})
|
||||||
if getErr != nil {
|
if getErr != nil {
|
||||||
if isRetryableAPIError(getErr) {
|
if isRetryableAPIError(getErr) {
|
||||||
|
@ -43,7 +43,7 @@ func createNamespace(c kubernetes.Interface, name string) error {
|
|||||||
return fmt.Errorf("failed to create namespace: %w", err)
|
return fmt.Errorf("failed to create namespace: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err := c.CoreV1().Namespaces().Get(context.TODO(), name, metav1.GetOptions{})
|
_, err := c.CoreV1().Namespaces().Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("Error getting namespace: '%s': %v", name, err)
|
framework.Logf("Error getting namespace: '%s': %v", name, err)
|
||||||
@ -68,7 +68,7 @@ func deleteNamespace(c kubernetes.Interface, name string) error {
|
|||||||
return fmt.Errorf("failed to delete namespace: %w", err)
|
return fmt.Errorf("failed to delete namespace: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err = c.CoreV1().Namespaces().Get(context.TODO(), name, metav1.GetOptions{})
|
_, err = c.CoreV1().Namespaces().Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if apierrs.IsNotFound(err) {
|
if apierrs.IsNotFound(err) {
|
||||||
|
@ -183,7 +183,7 @@ func createNFSStorageClass(
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
||||||
|
10
e2e/pod.go
10
e2e/pod.go
@ -60,7 +60,7 @@ func waitForDaemonSets(name, ns string, c kubernetes.Interface, t int) error {
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %v for all daemonsets in namespace '%s' to start", timeout, ns)
|
framework.Logf("Waiting up to %v for all daemonsets in namespace '%s' to start", timeout, ns)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
ds, err := c.AppsV1().DaemonSets(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
ds, err := c.AppsV1().DaemonSets(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("Error getting daemonsets in namespace: '%s': %v", ns, err)
|
framework.Logf("Error getting daemonsets in namespace: '%s': %v", ns, err)
|
||||||
@ -97,7 +97,7 @@ func findPodAndContainerName(f *framework.Framework, ns, cn string, opt *metav1.
|
|||||||
podList *v1.PodList
|
podList *v1.PodList
|
||||||
listErr error
|
listErr error
|
||||||
)
|
)
|
||||||
err := wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
podList, listErr = e2epod.PodClientNS(f, ns).List(context.TODO(), *opt)
|
podList, listErr = e2epod.PodClientNS(f, ns).List(context.TODO(), *opt)
|
||||||
if listErr != nil {
|
if listErr != nil {
|
||||||
if isRetryableAPIError(listErr) {
|
if isRetryableAPIError(listErr) {
|
||||||
@ -215,7 +215,7 @@ func listPods(f *framework.Framework, ns string, opt *metav1.ListOptions) ([]v1.
|
|||||||
func execWithRetry(f *framework.Framework, opts *e2epod.ExecOptions) (string, string, error) {
|
func execWithRetry(f *framework.Framework, opts *e2epod.ExecOptions) (string, string, error) {
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
var stdOut, stdErr string
|
var stdOut, stdErr string
|
||||||
err := wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
var execErr error
|
var execErr error
|
||||||
stdOut, stdErr, execErr = e2epod.ExecWithOptions(f, *opts)
|
stdOut, stdErr, execErr = e2epod.ExecWithOptions(f, *opts)
|
||||||
if execErr != nil {
|
if execErr != nil {
|
||||||
@ -353,7 +353,7 @@ func waitForPodInRunningState(name, ns string, c kubernetes.Interface, t int, ex
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %v to be in Running state", name)
|
framework.Logf("Waiting up to %v to be in Running state", name)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
pod, err := c.CoreV1().Pods(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
pod, err := c.CoreV1().Pods(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
@ -402,7 +402,7 @@ func deletePod(name, ns string, c kubernetes.Interface, t int) error {
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting for pod %v to be deleted", name)
|
framework.Logf("Waiting for pod %v to be deleted", name)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err := c.CoreV1().Pods(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
_, err := c.CoreV1().Pods(ns).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
|
24
e2e/pvc.go
24
e2e/pvc.go
@ -58,7 +58,7 @@ func createPVCAndvalidatePV(c kubernetes.Interface, pvc *v1.PersistentVolumeClai
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %v to be in Bound state", pvc)
|
framework.Logf("Waiting up to %v to be in Bound state", pvc)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
framework.Logf("waiting for PVC %s (%d seconds elapsed)", name, int(time.Since(start).Seconds()))
|
framework.Logf("waiting for PVC %s (%d seconds elapsed)", name, int(time.Since(start).Seconds()))
|
||||||
pvc, err = c.CoreV1().PersistentVolumeClaims(namespace).Get(context.TODO(), name, metav1.GetOptions{})
|
pvc, err = c.CoreV1().PersistentVolumeClaims(namespace).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -130,7 +130,7 @@ func deletePVCAndPV(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, pv *v
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
pvcToDelete := pvc
|
pvcToDelete := pvc
|
||||||
err = wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
// Check that the PVC is deleted.
|
// Check that the PVC is deleted.
|
||||||
framework.Logf(
|
framework.Logf(
|
||||||
"waiting for PVC %s in state %s to be deleted (%d seconds elapsed)",
|
"waiting for PVC %s in state %s to be deleted (%d seconds elapsed)",
|
||||||
@ -168,7 +168,7 @@ func deletePVCAndPV(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, pv *v
|
|||||||
start = time.Now()
|
start = time.Now()
|
||||||
pvToDelete := pv
|
pvToDelete := pv
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
// Check that the PV is deleted.
|
// Check that the PV is deleted.
|
||||||
framework.Logf(
|
framework.Logf(
|
||||||
"waiting for PV %s in state %s to be deleted (%d seconds elapsed)",
|
"waiting for PV %s in state %s to be deleted (%d seconds elapsed)",
|
||||||
@ -197,7 +197,12 @@ func getPersistentVolumeClaim(c kubernetes.Interface, namespace, name string) (*
|
|||||||
var pvc *v1.PersistentVolumeClaim
|
var pvc *v1.PersistentVolumeClaim
|
||||||
var err error
|
var err error
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
err = wait.PollImmediate(1*time.Second, timeout, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(
|
||||||
|
context.TODO(),
|
||||||
|
1*time.Second,
|
||||||
|
timeout,
|
||||||
|
true,
|
||||||
|
func(_ context.Context) (bool, error) {
|
||||||
pvc, err = c.CoreV1().PersistentVolumeClaims(namespace).Get(context.TODO(), name, metav1.GetOptions{})
|
pvc, err = c.CoreV1().PersistentVolumeClaims(namespace).Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("Error getting pvc %q in namespace %q: %v", name, namespace, err)
|
framework.Logf("Error getting pvc %q in namespace %q: %v", name, namespace, err)
|
||||||
@ -220,7 +225,12 @@ func getPersistentVolume(c kubernetes.Interface, name string) (*v1.PersistentVol
|
|||||||
var pv *v1.PersistentVolume
|
var pv *v1.PersistentVolume
|
||||||
var err error
|
var err error
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
err = wait.PollImmediate(1*time.Second, timeout, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(
|
||||||
|
context.TODO(),
|
||||||
|
1*time.Second,
|
||||||
|
timeout,
|
||||||
|
true,
|
||||||
|
func(_ context.Context) (bool, error) {
|
||||||
pv, err = c.CoreV1().PersistentVolumes().Get(context.TODO(), name, metav1.GetOptions{})
|
pv, err = c.CoreV1().PersistentVolumes().Get(context.TODO(), name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("Error getting pv %q: %v", name, err)
|
framework.Logf("Error getting pv %q: %v", name, err)
|
||||||
@ -275,7 +285,7 @@ func deletePVCAndValidatePV(c kubernetes.Interface, pvc *v1.PersistentVolumeClai
|
|||||||
}
|
}
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
// Check that the PVC is really deleted.
|
// Check that the PVC is really deleted.
|
||||||
framework.Logf(
|
framework.Logf(
|
||||||
"waiting for PVC %s in state %s to be deleted (%d seconds elapsed)",
|
"waiting for PVC %s in state %s to be deleted (%d seconds elapsed)",
|
||||||
@ -384,7 +394,7 @@ func getMetricsForPVC(f *framework.Framework, pvc *v1.PersistentVolumeClaim, t i
|
|||||||
// retry as kubelet does not immediately have the metrics available
|
// retry as kubelet does not immediately have the metrics available
|
||||||
timeout := time.Duration(t) * time.Minute
|
timeout := time.Duration(t) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
stdOut, stdErr, err := execCommandInToolBoxPod(f, cmd, rookNamespace)
|
stdOut, stdErr, err := execCommandInToolBoxPod(f, cmd, rookNamespace)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("failed to get metrics for pvc %q (%v): %v", pvc.Name, err, stdErr)
|
framework.Logf("failed to get metrics for pvc %q (%v): %v", pvc.Name, err, stdErr)
|
||||||
|
@ -212,7 +212,7 @@ func checkClusternameInMetadata(f *framework.Framework, ns, pool, image string)
|
|||||||
stdErr string
|
stdErr string
|
||||||
execErr error
|
execErr error
|
||||||
)
|
)
|
||||||
err := wait.PollImmediate(poll, t, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
coName, stdErr, execErr = execCommandInToolBoxPod(f,
|
coName, stdErr, execErr = execCommandInToolBoxPod(f,
|
||||||
fmt.Sprintf("rbd image-meta get %s --image=%s %s", rbdOptions(pool), image, clusterNameKey),
|
fmt.Sprintf("rbd image-meta get %s --image=%s %s", rbdOptions(pool), image, clusterNameKey),
|
||||||
ns)
|
ns)
|
||||||
@ -1887,7 +1887,7 @@ var _ = Describe("RBD", func() {
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
var reason string
|
var reason string
|
||||||
err = wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err = wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
var runningAttachCmd string
|
var runningAttachCmd string
|
||||||
runningAttachCmd, stdErr, err = execCommandInContainer(
|
runningAttachCmd, stdErr, err = execCommandInContainer(
|
||||||
f,
|
f,
|
||||||
|
@ -164,7 +164,7 @@ func createRBDStorageClass(
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
_, err = c.StorageV1().StorageClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
|
||||||
@ -1037,7 +1037,7 @@ func listRBDImagesInTrash(f *framework.Framework, poolName string) ([]trashInfo,
|
|||||||
func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int) error {
|
func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int) error {
|
||||||
var errReason error
|
var errReason error
|
||||||
timeout := time.Duration(t) * time.Minute
|
timeout := time.Duration(t) * time.Minute
|
||||||
err := wait.PollImmediate(poll, timeout, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
imagesInTrash, err := listRBDImagesInTrash(f, poolName)
|
imagesInTrash, err := listRBDImagesInTrash(f, poolName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
@ -50,7 +50,7 @@ func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size s
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %v to be in Resized state", pvc)
|
framework.Logf("Waiting up to %v to be in Resized state", pvc)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
framework.Logf("waiting for PVC %s (%d seconds elapsed)", pvcName, int(time.Since(start).Seconds()))
|
framework.Logf("waiting for PVC %s (%d seconds elapsed)", pvcName, int(time.Since(start).Seconds()))
|
||||||
updatedPVC, err = c.CoreV1().
|
updatedPVC, err = c.CoreV1().
|
||||||
PersistentVolumeClaims(pvcNamespace).
|
PersistentVolumeClaims(pvcNamespace).
|
||||||
@ -185,7 +185,7 @@ func checkAppMntSize(f *framework.Framework, opt *metav1.ListOptions, size, cmd,
|
|||||||
timeout := time.Duration(t) * time.Minute
|
timeout := time.Duration(t) * time.Minute
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
framework.Logf("executing cmd %s (%d seconds elapsed)", cmd, int(time.Since(start).Seconds()))
|
framework.Logf("executing cmd %s (%d seconds elapsed)", cmd, int(time.Since(start).Seconds()))
|
||||||
output, stdErr, err := execCommandInPod(f, cmd, ns, opt)
|
output, stdErr, err := execCommandInPod(f, cmd, ns, opt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -80,7 +80,7 @@ func createSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("waiting for %v to be in ready state", snap)
|
framework.Logf("waiting for %v to be in ready state", snap)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
framework.Logf("waiting for snapshot %s (%d seconds elapsed)", snap.Name, int(time.Since(start).Seconds()))
|
framework.Logf("waiting for snapshot %s (%d seconds elapsed)", snap.Name, int(time.Since(start).Seconds()))
|
||||||
snaps, err := sclient.
|
snaps, err := sclient.
|
||||||
VolumeSnapshots(snap.Namespace).
|
VolumeSnapshots(snap.Namespace).
|
||||||
@ -126,7 +126,7 @@ func deleteSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
|
|||||||
start := time.Now()
|
start := time.Now()
|
||||||
framework.Logf("Waiting up to %v to be deleted", snap)
|
framework.Logf("Waiting up to %v to be deleted", snap)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
framework.Logf("deleting snapshot %s (%d seconds elapsed)", name, int(time.Since(start).Seconds()))
|
framework.Logf("deleting snapshot %s (%d seconds elapsed)", name, int(time.Since(start).Seconds()))
|
||||||
_, err := sclient.
|
_, err := sclient.
|
||||||
VolumeSnapshots(snap.Namespace).
|
VolumeSnapshots(snap.Namespace).
|
||||||
@ -223,7 +223,7 @@ func createNFSSnapshotClass(f *framework.Framework) error {
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err = sclient.VolumeSnapshotClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
_, err = sclient.VolumeSnapshotClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("error creating SnapshotClass %q: %v", sc.Name, err)
|
framework.Logf("error creating SnapshotClass %q: %v", sc.Name, err)
|
||||||
@ -252,7 +252,7 @@ func deleteNFSSnapshotClass() error {
|
|||||||
|
|
||||||
timeout := time.Duration(deployTimeout) * time.Minute
|
timeout := time.Duration(deployTimeout) * time.Minute
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
err = sclient.VolumeSnapshotClasses().Delete(context.TODO(), sc.Name, metav1.DeleteOptions{})
|
err = sclient.VolumeSnapshotClasses().Delete(context.TODO(), sc.Name, metav1.DeleteOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Logf("error deleting SnapshotClass %q: %v", sc.Name, err)
|
framework.Logf("error deleting SnapshotClass %q: %v", sc.Name, err)
|
||||||
|
10
e2e/utils.go
10
e2e/utils.go
@ -248,7 +248,7 @@ func getMons(ns string, c kubernetes.Interface) ([]string, error) {
|
|||||||
|
|
||||||
var svcList *v1.ServiceList
|
var svcList *v1.ServiceList
|
||||||
t := time.Duration(deployTimeout) * time.Minute
|
t := time.Duration(deployTimeout) * time.Minute
|
||||||
err := wait.PollImmediate(poll, t, func() (bool, error) {
|
err := wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
var svcErr error
|
var svcErr error
|
||||||
svcList, svcErr = c.CoreV1().Services(ns).List(context.TODO(), opt)
|
svcList, svcErr = c.CoreV1().Services(ns).List(context.TODO(), opt)
|
||||||
if svcErr != nil {
|
if svcErr != nil {
|
||||||
@ -1560,7 +1560,7 @@ func waitForJobCompletion(c kubernetes.Interface, ns, job string, timeout int) e
|
|||||||
|
|
||||||
framework.Logf("waiting for Job %s/%s to be in state %q", ns, job, batch.JobComplete)
|
framework.Logf("waiting for Job %s/%s to be in state %q", ns, job, batch.JobComplete)
|
||||||
|
|
||||||
return wait.PollImmediate(poll, t, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, t, true, func(_ context.Context) (bool, error) {
|
||||||
j, err := c.BatchV1().Jobs(ns).Get(context.TODO(), job, metav1.GetOptions{})
|
j, err := c.BatchV1().Jobs(ns).Get(context.TODO(), job, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
@ -1608,7 +1608,7 @@ func retryKubectlInput(namespace string, action kubectlAction, data string, t in
|
|||||||
framework.Logf("waiting for kubectl (%s -f args %s) to finish", action, args)
|
framework.Logf("waiting for kubectl (%s -f args %s) to finish", action, args)
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
cmd := []string{}
|
cmd := []string{}
|
||||||
if len(args) != 0 {
|
if len(args) != 0 {
|
||||||
cmd = append(cmd, strings.Join(args, ""))
|
cmd = append(cmd, strings.Join(args, ""))
|
||||||
@ -1647,7 +1647,7 @@ func retryKubectlFile(namespace string, action kubectlAction, filename string, t
|
|||||||
framework.Logf("waiting for kubectl (%s -f %q args %s) to finish", action, filename, args)
|
framework.Logf("waiting for kubectl (%s -f %q args %s) to finish", action, filename, args)
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
cmd := []string{}
|
cmd := []string{}
|
||||||
if len(args) != 0 {
|
if len(args) != 0 {
|
||||||
cmd = append(cmd, strings.Join(args, ""))
|
cmd = append(cmd, strings.Join(args, ""))
|
||||||
@ -1690,7 +1690,7 @@ func retryKubectlArgs(namespace string, action kubectlAction, t int, args ...str
|
|||||||
framework.Logf("waiting for kubectl (%s args) to finish", args)
|
framework.Logf("waiting for kubectl (%s args) to finish", args)
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
return wait.PollImmediate(poll, timeout, func() (bool, error) {
|
return wait.PollUntilContextTimeout(context.TODO(), poll, timeout, true, func(_ context.Context) (bool, error) {
|
||||||
_, err := e2ekubectl.RunKubectl(namespace, args...)
|
_, err := e2ekubectl.RunKubectl(namespace, args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if isRetryableAPIError(err) {
|
if isRetryableAPIError(err) {
|
||||||
|
Loading…
Reference in New Issue
Block a user