Skip to content

Commit b5be119

Browse files
Merge pull request #30942 from alebedev87/dual-stack-skip-gwapi
NE-2422: Skip Gateway API tests on dual-stack clusters
2 parents 31582ab + f51f6f0 commit b5be119

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

test/extended/router/gatewayapicontroller.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
127127
g.Skip("Skipping on OKD cluster as OSSM is not available as a community operator")
128128
}
129129

130-
// skip non clould platforms since gateway needs LB service
131-
skipGatewayIfNonCloudPlatform(oc)
130+
skipGatewayForUnsupportedPlatform(oc)
132131
if !isNoOLMFeatureGateEnabled(oc) {
133132
// GatewayAPIController without GatewayAPIWithoutOLM featuregate
134133
// relies on OSSM OLM operator.
@@ -611,7 +610,10 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
611610
})
612611
})
613612

614-
func skipGatewayIfNonCloudPlatform(oc *exutil.CLI) {
613+
// skipGatewayForUnsupportedPlatform skips gateway API tests on non-cloud
614+
// platforms (gateway needs LB service) and on dual-stack clusters (dual-stack
615+
// support is not yet declared).
616+
func skipGatewayForUnsupportedPlatform(oc *exutil.CLI) {
615617
infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
616618
o.Expect(err).NotTo(o.HaveOccurred())
617619
o.Expect(infra).NotTo(o.BeNil())
@@ -625,6 +627,13 @@ func skipGatewayIfNonCloudPlatform(oc *exutil.CLI) {
625627
default:
626628
g.Skip(fmt.Sprintf("Skipping on non cloud platform type %q", platformType))
627629
}
630+
631+
if infra.Status.PlatformStatus.AWS != nil {
632+
ipFamily := infra.Status.PlatformStatus.AWS.IPFamily
633+
if ipFamily == configv1.DualStackIPv4Primary || ipFamily == configv1.DualStackIPv6Primary {
634+
g.Skip("Skipping Gateway API tests on dual-stack cluster")
635+
}
636+
}
628637
}
629638

630639
func isNoOLMFeatureGateEnabled(oc *exutil.CLI) bool {

0 commit comments

Comments
 (0)