Skip to content

NE-2789: Add a guard to skip IngressControllerMultipleHAProxyVersions tests if IngressController CRD lacks haproxyVersion field #31424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 25, 2026
+21 −0
Merged

NE-2789: Add a guard to skip IngressControllerMultipleHAProxyVersions tests if IngressController CRD lacks haproxyVersion field #31424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions test/extended/router/multi-haproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

operatorv1 "github.com/openshift/api/operator/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

"github.com/openshift/origin/test/extended/router/shard"
exutil "github.com/openshift/origin/test/extended/util"
Expand Down Expand Up @@ -60,6 +61,26 @@ var _ = g.Describe("[sig-network-edge][Feature:Router][apigroup:route.openshift.
})

g.BeforeEach(func() {

apiExtClient, err := apiextensionsclient.NewForConfig(oc.AdminConfig())
o.Expect(err).NotTo(o.HaveOccurred())

crd, err := apiExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, "ingresscontrollers.operator.openshift.io", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// Check if haproxyVersion field exists in the CRD schema
hasField := false
for _, v := range crd.Spec.Versions {
if v.Name == "v1" && v.Schema != nil && v.Schema.OpenAPIV3Schema != nil {
if _, ok := v.Schema.OpenAPIV3Schema.Properties["spec"].Properties["haproxyVersion"]; ok {
hasField = true
}
}
}
if !hasField {
g.Skip("IngressController CRD does not have haproxyVersion field — operator not yet updated")
}

defaultIC, err := operatorClient.OperatorV1().IngressControllers("openshift-ingress-operator").Get(ctx, "default", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(defaultIC.Status.EffectiveHAProxyVersion).NotTo(o.BeEmpty())
Expand Down