Merge pull request #29085 from danwinship/drop-sdn

CORENET-6418: drop openshift-sdn tests

Author: openshift-merge-bot[bot]

go.mod

@@ -65,7 +65,6 @@ require (
 	github.com/openshift/apiserver-library-go v0.0.0-20250710132015-f0d44ef6e53b
 	github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
 	github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
-	github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb
 	github.com/openshift/library-go v0.0.0-20250812160438-378de074fe7b
 	github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250118001652-a8b9c3c31417
 	github.com/pborman/uuid v1.2.0

go.sum

@@ -823,8 +823,6 @@ github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+S
 github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee h1:tOtrrxfDEW8hK3eEsHqxsXurq/D6LcINGfprkQC3hqY=
 github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee/go.mod h1:zhRiYyNMk89llof2qEuGPWPD+joQPhCRUc2IK0SB510=
-github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb h1:Dr0dbSQTAU9UaoAvimGjR+fsvwx2twJ5KR0s/jyAz88=
-github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb/go.mod h1:LnhqxbWhAnhPwilJ4yX1/ly7wCMCYJKkaiSJQSh+Wjg=
 github.com/openshift/kubernetes v1.30.1-0.20250906192346-6efb6a95323f h1:Wedy8leKvM/Ry4Wssfl1qQdyWsw5PW7+2ExHmF0k3cI=
 github.com/openshift/kubernetes v1.30.1-0.20250906192346-6efb6a95323f/go.mod h1:GwUMe2E0Dqe2YN/Nkg9QWNBktqiTR7y+HFxcIWKshXI=
 github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250906192346-6efb6a95323f h1:EJoUgXhGoIigpvlkXE4gsdXsSQo8n0B5rSO95B4zVrQ=

test/extended/cli/explain.go

@@ -21,7 +21,6 @@ import (
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/origin/test/extended/networking"
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
@@ -450,6 +449,13 @@ var (
 				pattern: `DESCRIPTION\:.*`,
 			},
 		},
+		"network.operator.openshift.io": {
+			{
+				gv:      schema.GroupVersion{Group: "network.operator.openshift.io", Version: "v1"},
+				field:   "operatorpkis.spec",
+				pattern: `DESCRIPTION\:.*`,
+			},
+		},
 	}
 
 	// This list holds apigroups whose resources are not similar for OpenShift and MicroShift.
@@ -468,34 +474,6 @@ var (
 			},
 		},
 	}
-
-	specialNetworkingTypes = []explainExceptions{
-		{
-			gv:      schema.GroupVersion{Group: "network.operator.openshift.io", Version: "v1"},
-			field:   "operatorpkis.spec",
-			pattern: `DESCRIPTION\:.*`,
-		},
-		{
-			gv:      schema.GroupVersion{Group: "network.openshift.io", Version: "v1"},
-			field:   "clusternetworks.clusterNetworks",
-			pattern: `DESCRIPTION\:.*`,
-		},
-		{
-			gv:      schema.GroupVersion{Group: "network.openshift.io", Version: "v1"},
-			field:   "hostsubnets.subnet",
-			pattern: `DESCRIPTION\:.*`,
-		},
-		{
-			gv:      schema.GroupVersion{Group: "network.openshift.io", Version: "v1"},
-			field:   "netnamespaces.netname",
-			pattern: `DESCRIPTION\:.*`,
-		},
-		{
-			gv:      schema.GroupVersion{Group: "network.openshift.io", Version: "v1"},
-			field:   "egressnetworkpolicies.spec",
-			pattern: `DESCRIPTION\:.*`,
-		},
-	}
 )
 
 func getCrdTypes(oc *exutil.CLI) []schema.GroupVersionResource {
@@ -571,10 +549,6 @@ var _ = g.Describe("[sig-cli] oc explain", func() {
 				delete(resourceMap, st.gv.WithResource(resource[0]))
 			}
 		}
-		for _, snt := range specialNetworkingTypes {
-			resource := strings.Split(snt.field, ".")
-			delete(resourceMap, snt.gv.WithResource(resource[0]))
-		}
 
 		e2e.Logf("These GroupVersionResources are missing proper explain test:")
 		for k := range resourceMap {
@@ -669,25 +643,6 @@ var _ = g.Describe("[sig-cli] oc explain", func() {
 	}
 })
 
-var _ = g.Describe("[sig-cli] oc explain networking types", func() {
-	defer g.GinkgoRecover()
-
-	oc := exutil.NewCLI("oc-explain")
-
-	networking.InOpenShiftSDNContext(func() {
-		g.It("should contain proper fields description for special networking types", func() {
-			crdClient := apiextensionsclientset.NewForConfigOrDie(oc.AdminConfig())
-			for _, st := range specialNetworkingTypes {
-				e2e.Logf("Checking %s, Field=%s...", st.gv, st.field)
-				resource := strings.Split(st.field, ".")
-				gvr := st.gv.WithResource(resource[0])
-				o.Expect(verifyExplain(oc, crdClient, gvr,
-					st.pattern, st.field, fmt.Sprintf("--api-version=%s", st.gv))).NotTo(o.HaveOccurred())
-			}
-		})
-	})
-})
-
 func verifySpecStatusExplain(oc *exutil.CLI, crdClient apiextensionsclientset.Interface, gvr schema.GroupVersionResource, fieldTypeNameOverrides map[string]string) error {
 	singularResourceName, _ := strings.CutSuffix(gvr.Resource, "s")
 	normalizedResourceName := fmt.Sprintf("(?i)%v(?-i)", singularResourceName) // case insensitive