Use timeout for the route table test We use a timeout for route table…

… reconcilation considering the route reconciling interval Signed-off-by: Zhecheng Li <[email protected]>
k8s-infra-cherrypick-robot · Jul 21, 2023 · 1f96130 · 1f96130
1 parent de4b993
commit 1f96130
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go
@@ -416,6 +416,9 @@ const (
 const (
 	RouteNameFmt       = "%s____%s"
 	RouteNameSeparator = "____"
+
+	// routeUpdateInterval defines the route reconciling interval.
+	RouteUpdateInterval = 30 * time.Second
 )
 
 // cloud provider config secret

diff --git a/pkg/provider/azure.go b/pkg/provider/azure.go
@@ -639,7 +639,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret, callFromC
 	// updating routes and syncing zones only in CCM
 	if callFromCCM {
 		// start delayed route updater.
-		az.routeUpdater = newDelayedRouteUpdater(az, routeUpdateInterval)
+		az.routeUpdater = newDelayedRouteUpdater(az, consts.RouteUpdateInterval)
 		go az.routeUpdater.run()
 
 		// Azure Stack does not support zone at the moment

diff --git a/pkg/provider/azure_routes.go b/pkg/provider/azure_routes.go
@@ -37,11 +37,6 @@ import (
 	"sigs.k8s.io/cloud-provider-azure/pkg/metrics"
 )
 
-var (
-	// routeUpdateInterval defines the route reconciling interval.
-	routeUpdateInterval = 30 * time.Second
-)
-
 // routeOperation defines the allowed operations for route updating.
 type routeOperation string
 

diff --git a/tests/e2e/network/node.go b/tests/e2e/network/node.go
@@ -23,6 +23,7 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2022-03-01/compute"
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2022-07-01/network"
@@ -31,8 +32,10 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
 
+	"sigs.k8s.io/cloud-provider-azure/pkg/consts"
 	"sigs.k8s.io/cloud-provider-azure/tests/e2e/utils"
 )
 
@@ -247,21 +250,23 @@ var _ = Describe("Azure node resources", Label(utils.TestSuiteLabelNode), func()
 		}
 		utils.Logf("nodeSet: %v", nodeSet)
 
-		var succeeded bool
-		for _, routeTable := range *routeTables {
-			utils.Logf("getting all routes in route table %s", *routeTable.Name)
-			routeSet, err := utils.GetNodesInRouteTable(routeTable)
-			Expect(err).NotTo(HaveOccurred())
-
-			utils.Logf("routeSet: %v", routeSet)
+		// Considering the route reconciling interval, the timeout is set to interval + 10s.
+		err = wait.PollImmediate(5*time.Second, consts.RouteUpdateInterval+10*time.Second, func() (bool, error) {
+			for _, routeTable := range *routeTables {
+				routeSet, err := utils.GetNodesInRouteTable(routeTable)
+				if err != nil {
+					return false, err
+				}
 
-			if reflect.DeepEqual(nodeSet, routeSet) {
-				succeeded = true
-				break
+				utils.Logf("all routes in route table: %v", routeSet)
+				if reflect.DeepEqual(nodeSet, routeSet) {
+					return true, nil
+				}
 			}
-		}
+			return false, nil
+		})
 
-		Expect(succeeded).To(BeTrue())
+		Expect(err).NotTo(HaveOccurred())
 	})
 })