github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 23:29:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[e2e] Update traffic distribution test
This commit is contained in:
Kubernetes Prow Robot 2024-10-01 15:53:49 +01:00 committed by GitHub
commit dc481fef90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/skipper/skipper.go
View File

@ -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. // SkipIfMultizone skips if the cluster has multizone.
func SkipIfMultizone(ctx context.Context, c clientset.Interface) { func SkipIfMultizone(ctx context.Context, c clientset.Interface) {
zones, err := e2enode.GetClusterZones(ctx, c) zones, err := e2enode.GetClusterZones(ctx, c)

2
test/e2e/network/traffic_distribution.go
View File

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