From 6a07cca0400540c22787b4577b7f0175bed9947e Mon Sep 17 00:00:00 2001 From: Mohammed Affan Date: Mon, 7 Aug 2023 15:41:10 +0530 Subject: [PATCH] Migrate deprecated wait.poll Signed-off-by: Mohammed Affan --- pkg/controllers/certificate/cert_rotation_controller.go | 2 +- pkg/karmadactl/register/register.go | 2 +- pkg/karmadactl/unjoin/unjoin.go | 2 +- pkg/util/serviceaccount.go | 2 +- test/e2e/rescheduling_test.go | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/controllers/certificate/cert_rotation_controller.go b/pkg/controllers/certificate/cert_rotation_controller.go index 70c109c1d..403f6c51e 100644 --- a/pkg/controllers/certificate/cert_rotation_controller.go +++ b/pkg/controllers/certificate/cert_rotation_controller.go @@ -181,7 +181,7 @@ func (c *CertRotationController) syncCertRotation(secret *corev1.Secret) error { var newCertData []byte klog.V(1).Infof("Waiting for the client certificate to be issued") - err = wait.Poll(1*time.Second, 5*time.Minute, func() (done bool, err error) { + err = wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, 5*time.Minute, false, func(ctx context.Context) (done bool, err error) { csr, err := c.KubeClient.CertificatesV1().CertificateSigningRequests().Get(context.TODO(), csr, metav1.GetOptions{}) if err != nil { return false, fmt.Errorf("failed to get the cluster csr %s. err: %v", clusterName, err) diff --git a/pkg/karmadactl/register/register.go b/pkg/karmadactl/register/register.go index 8727914fc..d7ece31f0 100644 --- a/pkg/karmadactl/register/register.go +++ b/pkg/karmadactl/register/register.go @@ -545,7 +545,7 @@ func (o *CommandRegisterOption) constructKarmadaAgentConfig(bootstrapClient *kub } klog.V(1).Infof("Waiting for the client certificate to be issued") - err = wait.Poll(1*time.Second, o.Timeout, func() (done bool, err error) { + err = wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, o.Timeout, false, func(ctx context.Context) (done bool, err error) { csrOK, err := bootstrapClient.CertificatesV1().CertificateSigningRequests().Get(context.TODO(), csrName, metav1.GetOptions{}) if err != nil { return false, fmt.Errorf("failed to get the cluster csr %s. err: %v", o.ClusterName, err) diff --git a/pkg/karmadactl/unjoin/unjoin.go b/pkg/karmadactl/unjoin/unjoin.go index 1d692fd55..3c4498298 100644 --- a/pkg/karmadactl/unjoin/unjoin.go +++ b/pkg/karmadactl/unjoin/unjoin.go @@ -239,7 +239,7 @@ func (j *CommandUnjoinOption) deleteClusterObject(controlPlaneKarmadaClient *kar } // make sure the given cluster object has been deleted - err = wait.Poll(1*time.Second, j.Wait, func() (done bool, err error) { + err = wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, j.Wait, false, func(ctx context.Context) (done bool, err error) { _, err = controlPlaneKarmadaClient.ClusterV1alpha1().Clusters().Get(context.TODO(), j.ClusterName, metav1.GetOptions{}) if apierrors.IsNotFound(err) { return true, nil diff --git a/pkg/util/serviceaccount.go b/pkg/util/serviceaccount.go index cfe799138..b24efa151 100644 --- a/pkg/util/serviceaccount.go +++ b/pkg/util/serviceaccount.go @@ -91,7 +91,7 @@ func EnsureServiceAccountExist(client kubeclient.Interface, serviceAccountObj *c // WaitForServiceAccountSecretCreation wait the ServiceAccount's secret has been created. func WaitForServiceAccountSecretCreation(client kubeclient.Interface, asObj *corev1.ServiceAccount) (*corev1.Secret, error) { var clusterSecret *corev1.Secret - err := wait.Poll(1*time.Second, 30*time.Second, func() (done bool, err error) { + err := wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, 30*time.Second, false, func(ctx context.Context) (done bool, err error) { serviceAccount, err := client.CoreV1().ServiceAccounts(asObj.Namespace).Get(context.TODO(), asObj.Name, metav1.GetOptions{}) if err != nil { if apierrors.IsNotFound(err) { diff --git a/test/e2e/rescheduling_test.go b/test/e2e/rescheduling_test.go index fe86da644..33f44af1d 100644 --- a/test/e2e/rescheduling_test.go +++ b/test/e2e/rescheduling_test.go @@ -19,6 +19,7 @@ package e2e import ( "fmt" "os" + "time" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" @@ -136,6 +137,7 @@ var _ = ginkgo.Describe("[cluster unjoined] reschedule testing", func() { opts := unjoin.CommandUnjoinOption{ ClusterNamespace: "karmada-cluster", ClusterName: newClusterName, + Wait: 60 * time.Second, } err := opts.Run(f) gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) @@ -194,6 +196,7 @@ var _ = ginkgo.Describe("[cluster joined] reschedule testing", func() { opts := unjoin.CommandUnjoinOption{ ClusterNamespace: "karmada-cluster", ClusterName: newClusterName, + Wait: 60 * time.Second, } err := opts.Run(f) gomega.Expect(err).ShouldNot(gomega.HaveOccurred())