Merge pull request kubernetes#123981 from lzhecheng/update-traffic-distribution-test

[e2e] Update traffic distribution test

Author: k8s-ci-robot

test/e2e/framework/skipper/skipper.go

@@ -133,6 +133,17 @@ func SkipUnlessMultizone(ctx context.Context, c clientset.Interface) {
 	}
 }
 
+// SkipUnlessAtLeastNZones skips if the cluster does not have n multizones.
+func SkipUnlessAtLeastNZones(ctx context.Context, c clientset.Interface, n int) {
+	zones, err := e2enode.GetClusterZones(ctx, c)
+	if err != nil {
+		skipInternalf(1, "Error listing cluster zones")
+	}
+	if zones.Len() < n {
+		skipInternalf(1, "Requires >= %d zones", n)
+	}
+}
+
 // SkipIfMultizone skips if the cluster has multizone.
 func SkipIfMultizone(ctx context.Context, c clientset.Interface) {
 	zones, err := e2enode.GetClusterZones(ctx, c)

test/e2e/network/traffic_distribution.go

@@ -50,7 +50,7 @@ var _ = common.SIGDescribe(feature.TrafficDistribution, func() {
 
 	ginkgo.BeforeEach(func(ctx context.Context) {
 		c = f.ClientSet
-		e2eskipper.SkipUnlessMultizone(ctx, c)
+		e2eskipper.SkipUnlessAtLeastNZones(ctx, c, 3)
 	})
 
 	////////////////////////////////////////////////////////////////////////////