diff --git a/test/e2e/clusterpropagationpolicy_test.go b/test/e2e/clusterpropagationpolicy_test.go index 31155bd3e..094ce623a 100644 --- a/test/e2e/clusterpropagationpolicy_test.go +++ b/test/e2e/clusterpropagationpolicy_test.go @@ -78,7 +78,7 @@ var _ = ginkgo.Describe("[BasicClusterPropagation] basic cluster propagation tes gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for crd(%s) present on cluster(%s)", crd.Name, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterDynamicClient.Resource(crdGVR).Namespace(crd.Namespace).Get(context.TODO(), crd.Name, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -103,7 +103,7 @@ var _ = ginkgo.Describe("[BasicClusterPropagation] basic cluster propagation tes gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for crd(%s) disappeared on cluster(%s)", crd.Name, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterDynamicClient.Resource(crdGVR).Namespace(crd.Namespace).Get(context.TODO(), crd.Name, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/failover_test.go b/test/e2e/failover_test.go index c053f5cdd..cf935ce85 100644 --- a/test/e2e/failover_test.go +++ b/test/e2e/failover_test.go @@ -100,7 +100,7 @@ var _ = ginkgo.Describe("failover testing", func() { currentCluster, _ := util.GetCluster(controlPlaneClient, targetClusterName) // wait for the current cluster status changing to false - _ = wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + _ = wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { if !meta.IsStatusConditionPresentAndEqual(currentCluster.Status.Conditions, clusterv1alpha1.ClusterConditionReady, metav1.ConditionFalse) { fmt.Printf("current cluster %s is false\n", targetClusterName) disabledClusters = append(disabledClusters, currentCluster) @@ -125,7 +125,7 @@ var _ = ginkgo.Describe("failover testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Check whether deployment(%s/%s) is present on cluster(%s)", deploymentNamespace, deploymentName, targetClusterName) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -163,7 +163,7 @@ var _ = ginkgo.Describe("failover testing", func() { // disableCluster will set wrong API endpoint of current cluster func disableCluster(c client.Client, clusterName string) error { - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { clusterObj := &clusterv1alpha1.Cluster{} if err := c.Get(context.TODO(), client.ObjectKey{Name: clusterName}, clusterObj); err != nil { if errors.IsConflict(err) { @@ -187,7 +187,7 @@ func disableCluster(c client.Client, clusterName string) error { // recoverCluster will recover API endpoint of the disable cluster func recoverCluster(c client.Client, clusterName string, originalAPIEndpoint string) error { - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { clusterObj := &clusterv1alpha1.Cluster{} if err := c.Get(context.TODO(), client.ObjectKey{Name: clusterName}, clusterObj); err != nil { return false, err @@ -212,7 +212,7 @@ func getTargetClusterNames(deployment *appsv1.Deployment) (targetClusterNames [] binding := &workv1alpha1.ResourceBinding{} fmt.Printf("collect the target clusters in resource binding\n") - err = wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err = wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { err = controlPlaneClient.Get(context.TODO(), client.ObjectKey{Namespace: deployment.Namespace, Name: bindingName}, binding) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go index 10e1d2d66..6f670d57d 100644 --- a/test/e2e/namespace_test.go +++ b/test/e2e/namespace_test.go @@ -43,7 +43,7 @@ var _ = ginkgo.Describe("[namespace auto-provision] namespace auto-provision tes clusterClient := getClusterClient(cluster.Name) gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -74,9 +74,12 @@ var _ = ginkgo.Describe("[namespace auto-provision] namespace auto-provision tes clusterClient := getClusterClient(cluster.Name) gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if err != nil { + if errors.IsNotFound(err) { + return false, nil + } return false, err } return true, nil @@ -98,7 +101,7 @@ var _ = ginkgo.Describe("[namespace auto-provision] namespace auto-provision tes clusterClient := getClusterClient(cluster.Name) gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -191,7 +194,7 @@ var _ = ginkgo.Describe("[namespace auto-provision] namespace auto-provision tes gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) clusterClient, err := util.NewClusterClientSet(clusterJoined, controlPlaneClient) gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) - err = wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err = wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.KubeClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/overridepolicy_test.go b/test/e2e/overridepolicy_test.go index ff8ef42d6..13b35117f 100644 --- a/test/e2e/overridepolicy_test.go +++ b/test/e2e/overridepolicy_test.go @@ -109,7 +109,7 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() { var deploymentInCluster *appsv1.Deployment klog.Infof("Waiting for deployment(%s/%s) present on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { deploymentInCluster, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -225,7 +225,7 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() { var podInClusters *corev1.Pod klog.Infof("Waiting for pod(%s/%s) present on cluster(%s)", podNamespace, podName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { podInClusters, err = clusterClient.CoreV1().Pods(podNamespace).Get(context.TODO(), podName, metav1.GetOptions{}) if err != nil { @@ -335,7 +335,7 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() { var deploymentInCluster *appsv1.Deployment klog.Infof("Waiting for deployment(%s/%s) present on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { deploymentInCluster, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -438,7 +438,7 @@ var _ = ginkgo.Describe("OverridePolicy with nil resourceSelectors", func() { var deploymentInCluster *appsv1.Deployment klog.Infof("Waiting for deployment(%s/%s) present on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { deploymentInCluster, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/propagationpolicy_test.go b/test/e2e/propagationpolicy_test.go index e0252f3cd..e21434fd6 100644 --- a/test/e2e/propagationpolicy_test.go +++ b/test/e2e/propagationpolicy_test.go @@ -70,7 +70,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for deployment(%s/%s) present on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -103,7 +103,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for deployment(%s/%s) synced on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { dep, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { return false, err @@ -130,7 +130,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for deployment(%s/%s) disappear on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -192,7 +192,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for service(%s/%s) present on cluster(%s)", serviceNamespace, serviceName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Services(serviceNamespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -227,7 +227,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for service(%s/%s) synced on cluster(%s)", serviceNamespace, serviceName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { service, err := clusterClient.CoreV1().Services(serviceNamespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) if err != nil { return false, err @@ -254,7 +254,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for service(%s/%s) disappear on cluster(%s)", serviceNamespace, serviceName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Services(serviceNamespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -316,7 +316,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for pod(%s/%s) present on cluster(%s)", podNamespace, podName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Pods(podNamespace).Get(context.TODO(), podName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -351,7 +351,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for pod(%s/%s) synced on cluster(%s)", podNamespace, podName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { pod, err := clusterClient.CoreV1().Pods(podNamespace).Get(context.TODO(), podName, metav1.GetOptions{}) if err != nil { return false, err @@ -378,7 +378,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for pod(%s/%s) disappear on cluster(%s)", podNamespace, podName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.CoreV1().Pods(podNamespace).Get(context.TODO(), podName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -494,7 +494,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for cr(%s/%s) present on cluster(%s)", crNamespace, crName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterDynamicClient.Resource(crGVR).Namespace(crNamespace).Get(context.TODO(), crName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -529,7 +529,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for cr(%s/%s) synced on cluster(%s)", crNamespace, crName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { cr, err := dynamicClient.Resource(crGVR).Namespace(crNamespace).Get(context.TODO(), crName, metav1.GetOptions{}) if err != nil { return false, err @@ -560,7 +560,7 @@ var _ = ginkgo.Describe("[BasicPropagation] basic propagation testing", func() { gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for cr(%s/%s) disappear on cluster(%s)", crNamespace, crName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = dynamicClient.Resource(crGVR).Namespace(crNamespace).Get(context.TODO(), crName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/resource_test.go b/test/e2e/resource_test.go index b2736c43e..f5039c287 100644 --- a/test/e2e/resource_test.go +++ b/test/e2e/resource_test.go @@ -63,7 +63,7 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection wantedReplicas := *deployment.Spec.Replicas * int32(len(clusters)) klog.Infof("Waiting for deployment(%s/%s) collecting correctly status", deploymentNamespace, deploymentName) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { currentDeployment, err := kubeClient.AppsV1().Deployments(testNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) @@ -97,7 +97,7 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection wantedReplicas := updateDeploymentReplicas * int32(len(clusters)) klog.Infof("Waiting for deployment(%s/%s) collecting correctly status", deploymentNamespace, deploymentName) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { currentDeployment, err := kubeClient.AppsV1().Deployments(testNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) diff --git a/test/e2e/scheduling_test.go b/test/e2e/scheduling_test.go index 89dc9607b..14a6d24b9 100644 --- a/test/e2e/scheduling_test.go +++ b/test/e2e/scheduling_test.go @@ -88,7 +88,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", fmt.Printf("deploy kind is %s, name is %s\n", deployment.Kind, deployment.Name) binding := &workv1alpha1.ResourceBinding{} - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { err = controlPlaneClient.Get(context.TODO(), client.ObjectKey{Namespace: deployment.Namespace, Name: bindingName}, binding) if err != nil { if errors.IsNotFound(err) { @@ -114,7 +114,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Check whether deployment(%s/%s) is present on cluster(%s)", deploymentNamespace, deploymentName, targetClusterName) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -152,7 +152,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for deployment(%s/%s) synced on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { dep, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { return false, err @@ -179,7 +179,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for deployment(%s/%s) disappear on cluster(%s)", deploymentNamespace, deploymentName, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -267,7 +267,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", binding := &workv1alpha1.ClusterResourceBinding{} fmt.Printf("MaxGroups= %v, MinGroups= %v\n", maxGroups, minGroups) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { err = controlPlaneClient.Get(context.TODO(), client.ObjectKey{Name: bindingName}, binding) if err != nil { if errors.IsNotFound(err) { @@ -292,7 +292,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for crd(%s) present on cluster(%s)", crd.Name, targetClusterName) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterDynamicClient.Resource(crdGVR).Namespace(crd.Namespace).Get(context.TODO(), crd.Name, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { @@ -322,7 +322,7 @@ var _ = ginkgo.Describe("propagation with label and group constraints testing", gomega.Expect(clusterDynamicClient).ShouldNot(gomega.BeNil()) klog.Infof("Waiting for crd(%s) disappeared on cluster(%s)\n", crd.Name, cluster.Name) - err := wait.Poll(pollInterval, pollTimeout, func() (done bool, err error) { + err := wait.PollImmediate(pollInterval, pollTimeout, func() (done bool, err error) { _, err = clusterDynamicClient.Resource(crdGVR).Namespace(crd.Namespace).Get(context.TODO(), crd.Name, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index e3e4db489..f47d899b0 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -327,7 +327,7 @@ func newClusterClientSet(c *clusterv1alpha1.Cluster) (*util.ClusterClient, *util // set cluster label of E2E func SetClusterLabel(c client.Client, clusterName string) error { - err := wait.Poll(2*time.Second, 10*time.Second, func() (done bool, err error) { + err := wait.PollImmediate(2*time.Second, 10*time.Second, func() (done bool, err error) { clusterObj := &clusterv1alpha1.Cluster{} if err := c.Get(context.TODO(), client.ObjectKey{Name: clusterName}, clusterObj); err != nil { if errors.IsConflict(err) { @@ -352,7 +352,7 @@ func SetClusterLabel(c client.Client, clusterName string) error { // delete cluster label of E2E func DeleteClusterLabel(c client.Client, clusterName string) error { - err := wait.Poll(2*time.Second, 10*time.Second, func() (done bool, err error) { + err := wait.PollImmediate(2*time.Second, 10*time.Second, func() (done bool, err error) { clusterObj := &clusterv1alpha1.Cluster{} if err := c.Get(context.TODO(), client.ObjectKey{Name: clusterName}, clusterObj); err != nil { if errors.IsConflict(err) {