Merge pull request #1945 from k8s-infra-cherrypick-robot/cherry-pick-1944-to-release-1.26

[release-1.26] cleanup: remove deprecated wait.PollImediate function

Author: andyzhangx

pkg/blob/controllerserver.go

@@ -807,7 +807,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
 	case util.AzcopyJobError, util.AzcopyJobCompleted, util.AzcopyJobCompletedWithErrors, util.AzcopyJobCompletedWithSkipped, util.AzcopyJobCompletedWithErrorsAndSkipped:
 		return err
 	case util.AzcopyJobRunning:
-		err = wait.PollImmediate(20*time.Second, time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, func() (bool, error) {
+		err = wait.PollUntilContextTimeout(ctx, 20*time.Second, time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, true, func(context.Context) (bool, error) {
 			jobState, percent, err := d.azcopy.GetAzcopyJob(dstContainerName, authAzcopyEnv)
 			klog.V(2).Infof("azcopy job status: %s, copy percent: %s%%, error: %v", jobState, percent, err)
 			if err != nil {

pkg/blob/controllerserver_test.go

@@ -1774,7 +1774,7 @@ func TestCopyVolume(t *testing.T) {
 				d.waitForAzCopyTimeoutMinutes = 1
 
 				err := d.copyVolume(ctx, req, "", "sastoken", nil, "dstContainer", "", &accountOptions, defaultStorageEndPointSuffix)
-				if !reflect.DeepEqual(err, wait.ErrWaitTimeout) {
+				if !reflect.DeepEqual(err, context.DeadlineExceeded) {
 					t.Errorf("Unexpected error: %v", err)
 				}
 			},

test/e2e/testsuites/testsuites.go

@@ -645,7 +645,7 @@ func waitForPersistentVolumeClaimDeleted(ctx context.Context, c clientset.Interf
 
 func pollForStringWorker(namespace string, pod string, command []string, expectedString string, ch chan<- error) {
 	args := append([]string{"exec", pod, "--"}, command...)
-	err := wait.PollImmediate(poll, pollForStringTimeout, func() (bool, error) {
+	err := wait.PollUntilContextTimeout(context.Background(), poll, pollForStringTimeout, true, func(context.Context) (bool, error) {
 		stdout, err := e2ekubectl.RunKubectl(namespace, args...)
 		if err != nil {
 			framework.Logf("Error waiting for output %q in pod %q: %v.", expectedString, pod, err)