Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate deprecated wait.Poll function #3906

Merged
merged 2 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -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(context.Context) (done bool, err error) {
csr, err := c.KubeClient.CertificatesV1().CertificateSigningRequests().Get(context.TODO(), csr, metav1.GetOptions{})
Affan-7 marked this conversation as resolved.
Show resolved Hide resolved
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 @@ -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(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 @@ -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(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 @@ -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(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 @@ -19,6 +19,7 @@ package e2e
import (
"fmt"
"os"
"time"

"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down