Merge pull request #1748 from lobshunter/update-poll

chore: replace deprecated poll method

Author: AkihiroSuda

pkg/guestagent/kubernetesservice/kubernetesservice.go

@@ -54,16 +54,15 @@ func (s *ServiceWatcher) getServiceInformer() cache.SharedIndexInformer {
 }
 
 func (s *ServiceWatcher) Start() {
-	retryInterval := 10 * time.Second
-	//nolint:staticcheck // SA1019: wait.PollInfinite is deprecated
-	wait.PollInfinite(retryInterval, func() (done bool, err error) {
+	const retryInterval = 10 * time.Second
+	const pollImmediately = false
+	wait.PollUntilContextCancel(context.TODO(), retryInterval, pollImmediately, func(ctx context.Context) (done bool, err error) {
 		kubeClient, err := tryGetKubeClient()
 		if err != nil {
 			logrus.Tracef("failed to get kube client: %v, will retry in %v", err, retryInterval)
 			return false, nil
 		}
 
-		ctx := context.TODO()
 		informerFactory := informers.NewSharedInformerFactory(kubeClient, time.Hour)
 		serviceInformer := informerFactory.Core().V1().Services().Informer()
 		informerFactory.Start(ctx.Done())

pkg/guestagent/kubernetesservice/kubernetesservice_test.go

@@ -3,9 +3,9 @@ package kubernetesservice
 import (
 	"context"
 	"net"
-	"reflect"
 	"testing"
 
+	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -107,16 +107,14 @@ func TestGetPorts(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			_, err := kubeClient.CoreV1().Services("default").Create(ctx, &c.service, metav1.CreateOptions{})
-			if err != nil {
-				t.Fatalf("failed to create service: %v", err)
-			}
+			assert.NilError(t, err, "failed to create service [%s]", c.service.Name)
+
 			<-serviceCreatedCh
 
 			got := serviceWatcher.GetPorts()
-			if !reflect.DeepEqual(got, c.want) {
-				t.Errorf("got %v, want %v", got, c.want)
-			}
-			kubeClient.CoreV1().Services("default").Delete(ctx, c.service.Name, metav1.DeleteOptions{})
+			assert.DeepEqual(t, got, c.want)
+			err = kubeClient.CoreV1().Services("default").Delete(ctx, c.service.Name, metav1.DeleteOptions{})
+			assert.NilError(t, err, "failed to delete service [%s]", c.service.Name)
 		})
 	}
 }