From a6ee8599f184d74fcd83d9fd112171ad74104af7 Mon Sep 17 00:00:00 2001 From: googs1025 Date: Sat, 20 Jul 2024 16:13:36 +0800 Subject: [PATCH 1/2] chore: use WaitForCacheSync method after sharedInformerFactory Start --- test/integration/servicecidr/migration_test.go | 2 ++ test/integration/servicecidr/servicecidr_test.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/integration/servicecidr/migration_test.go b/test/integration/servicecidr/migration_test.go index 0bd3ee10824..abf1b7c21e6 100644 --- a/test/integration/servicecidr/migration_test.go +++ b/test/integration/servicecidr/migration_test.go @@ -82,6 +82,7 @@ func TestMigrateServiceCIDR(t *testing.T) { client1, ).Run(tCtx, 5) informers1.Start(tCtx.Done()) + informers1.WaitForCacheSync(tCtx.Done()) // the default serviceCIDR should have a finalizer and ready condition set to true if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) { @@ -220,6 +221,7 @@ func TestMigrateServiceCIDR(t *testing.T) { client2, ).Run(tCtx2, 5) informers2.Start(tCtx2.Done()) + informers2.WaitForCacheSync(tCtx.Done()) // delete the kubernetes.default service so the old DefaultServiceCIDR can be deleted // and the new apiserver can take over diff --git a/test/integration/servicecidr/servicecidr_test.go b/test/integration/servicecidr/servicecidr_test.go index a493e30e4cc..5fb84ebae3e 100644 --- a/test/integration/servicecidr/servicecidr_test.go +++ b/test/integration/servicecidr/servicecidr_test.go @@ -68,6 +68,7 @@ func TestServiceAllocNewServiceCIDR(t *testing.T) { client, ).Run(ctx, 5) informerFactory.Start(ctx.Done()) + informerFactory.WaitForCacheSync(ctx.Done()) // /29 = 6 services, kubernetes.default takes the first address // make 5 more services to take up all IPs @@ -169,6 +170,7 @@ func TestServiceCIDRDeletion(t *testing.T) { client, ).Run(ctx, 5) informerFactory.Start(ctx.Done()) + informerFactory.WaitForCacheSync(ctx.Done()) // /29 = 6 services, kubernetes.default takes the first address // make 5 more services to take up all IPs From bc514ff68b3da93363080269b94d40ee8b7658ce Mon Sep 17 00:00:00 2001 From: googs1025 Date: Sat, 20 Jul 2024 16:19:47 +0800 Subject: [PATCH 2/2] chore: remove t.Fatal typo --- test/integration/servicecidr/servicecidr_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/servicecidr/servicecidr_test.go b/test/integration/servicecidr/servicecidr_test.go index 5fb84ebae3e..579597c420d 100644 --- a/test/integration/servicecidr/servicecidr_test.go +++ b/test/integration/servicecidr/servicecidr_test.go @@ -182,7 +182,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // create a new ServiceCIDRs that overlaps the default one _, err = client.NetworkingV1beta1().ServiceCIDRs().Create(ctx, makeServiceCIDR("cidr1", cidr1, ""), metav1.CreateOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } // Wait until is ready. if err := wait.PollUntilContextTimeout(context.Background(), 250*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (bool, error) { @@ -197,7 +197,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // we should be able to delete the ServiceCIDR despite it contains IP addresses as it overlaps with the default ServiceCIDR err = client.NetworkingV1beta1().ServiceCIDRs().Delete(ctx, "cidr1", metav1.DeleteOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } if err := wait.PollUntilContextTimeout(context.Background(), 250*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (bool, error) { @@ -213,7 +213,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // add a new ServiceCIDR with a new range _, err = client.NetworkingV1beta1().ServiceCIDRs().Create(ctx, makeServiceCIDR("cidr2", cidr2, ""), metav1.CreateOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } // wait the allocator process the new ServiceCIDR // Wait until is ready. @@ -239,7 +239,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // add a new ServiceCIDR that overlaps the existing one _, err = client.NetworkingV1beta1().ServiceCIDRs().Create(ctx, makeServiceCIDR("cidr3", cidr3, ""), metav1.CreateOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } // Wait until is ready. if err := wait.PollUntilContextTimeout(context.Background(), 250*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (bool, error) { @@ -254,7 +254,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // we should be able to delete the ServiceCIDR2 despite it contains IP addresses as it is contained on ServiceCIDR3 err = client.NetworkingV1beta1().ServiceCIDRs().Delete(ctx, "cidr2", metav1.DeleteOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } if err := wait.PollUntilContextTimeout(context.Background(), 250*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (bool, error) { @@ -270,7 +270,7 @@ func TestServiceCIDRDeletion(t *testing.T) { // serviceCIDR3 will not be able to be deleted until the IPAddress is removed err = client.NetworkingV1beta1().ServiceCIDRs().Delete(ctx, "cidr3", metav1.DeleteOptions{}) if err != nil { - t.Fatal((err)) + t.Fatal(err) } // Wait until is not ready. if err := wait.PollUntilContextTimeout(context.Background(), 250*time.Millisecond, 30*time.Second, false, func(ctx context.Context) (bool, error) {