Skip to content

[release-4.20] OCPBUGS-85523: Remove restriction of unmanaged x-k8s.io #31351

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

Open
rikatz wants to merge 2 commits into
base: release-4.20
Choose a base branch
from
+7 −13
Open

[release-4.20] OCPBUGS-85523: Remove restriction of unmanaged x-k8s.io #31351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cdd2e2
NE-2376: Remove restriction of unmanaged x-k8s.io
rikatz Jan 7, 2026
432eb81
NE-2376: generate new test files for backport
rikatz Jun 29, 2026
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
16 changes: 7 additions & 9 deletions test/extended/router/gatewayapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package router

import (
"context"
"slices"
"strings"

g "github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -77,17 +78,14 @@ var _ = g.Describe("[sig-network][OCPFeatureGate:GatewayAPI][Feature:Router][api
if crd.Spec.Group == "gateway.networking.x-k8s.io" {
e2e.Failf("Found unexpected CRD named: %v", crd.Name)
}
// Check standard group GWAPI CRDs to ensure they are not in the experimental channel
if slices.Contains(crdNames, crd.Name) {
if channel, ok := crd.Annotations["gateway.networking.k8s.io/channel"]; ok && channel == "experimental" {
e2e.Failf("Found experimental channel CRD: %v (expected standard channel)", crd.Name)
}
}
}
})

g.It("and ensure CRD of experimental group can not be created", func() {
expCRDName := "xlistenersets.gateway.networking.x-k8s.io"
g.By("Try to create CRD of experimental group and fail")
expCRD := buildGWAPICRDFromName(expCRDName)
_, err := oc.AdminApiextensionsClient().ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), expCRD, metav1.CreateOptions{})
o.Expect(err).To(o.HaveOccurred())
o.Expect(err.Error()).To(o.ContainSubstring(errorMessage))
})
})
})

Expand Down
2 changes: 0 additions & 2 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions zz_generated.manifests/test-reporting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ spec:
to the ''sub'' claim in the access token from the IdP'
- featureGate: GatewayAPI
tests:
- testName: '[sig-network][OCPFeatureGate:GatewayAPI][Feature:Router][apigroup:gateway.networking.k8s.io]
Verify Gateway API CRDs and ensure CRD of experimental group can not be created'
- testName: '[sig-network][OCPFeatureGate:GatewayAPI][Feature:Router][apigroup:gateway.networking.k8s.io]
Verify Gateway API CRDs and ensure CRD of experimental group is not installed'
- testName: '[sig-network][OCPFeatureGate:GatewayAPI][Feature:Router][apigroup:gateway.networking.k8s.io]
Expand Down