Skip to content

Commit

Permalink
Migrate deprecated wait.poll
Browse files Browse the repository at this point in the history
Signed-off-by: Mohammed Affan <mohammed.affan.727@gmail.com>
  • Loading branch information
Affan-7 committed Aug 12, 2023
1 parent e5277b6 commit 2954bcb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/controllers/certificate/cert_rotation_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/karmadactl/register/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/karmadactl/unjoin/unjoin.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,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
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/serviceaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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) {
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/rescheduling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package e2e
import (
"fmt"
"os"
"time"

"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
Expand Down Expand Up @@ -120,6 +121,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())
Expand Down Expand Up @@ -178,6 +180,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())
Expand Down

0 comments on commit 2954bcb

Please sign in to comment.