OCPBUGS-105402: Remove EVPN feature gate references

bindata/network/ovn-kubernetes/common/002-rbac-node.yaml

@@ -214,16 +214,6 @@ rules:
   - get
   - watch
 {{- end}}
-{{- if .OVN_EVPN_ENABLE }}
-- apiGroups:
-  - k8s.ovn.org
-  resources:
-  - vteps
-  verbs:
-  - list
-  - get
-  - watch
-{{- end}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

bindata/network/ovn-kubernetes/common/004-rbac-control-plane.yaml

@@ -267,25 +267,6 @@ rules:
   - patch
   - update
 {{- end}}
-{{- if .OVN_EVPN_ENABLE }}
-- apiGroups:
-  - k8s.ovn.org
-  resources:
-  - vteps
-  verbs:
-  - list
-  - get
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - k8s.ovn.org
-  resources:
-  - vteps/status
-  verbs:
-  - patch
-  - update
-{{- end}}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1

bindata/network/ovn-kubernetes/common/008-script-lib.yaml

@@ -643,11 +643,6 @@ data:
         route_advertisements_enable_flag="--enable-route-advertisements"
       fi
 
-      evpn_enable_flag=
-      if [[ "{{.OVN_EVPN_ENABLE}}" == "true" ]]; then
-        evpn_enable_flag="--enable-evpn"
-      fi
-
       network_observability_enabled_flag=
       if [[ "{{.OVN_OBSERVABILITY_ENABLE}}" == "true" ]]; then
         network_observability_enabled_flag="--enable-observability"
@@ -743,7 +738,6 @@ data:
         --disable-snat-multiple-gws \
         ${export_network_flows_flags} \
         ${route_advertisements_enable_flag} \
-        ${evpn_enable_flag} \
         ${network_observability_enabled_flag} \
         --zone ${K8S_NODE} \
         ${enable_interconnect_flag} \

bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml

@@ -194,11 +194,6 @@ spec:
           if [[ "{{.OVN_ROUTE_ADVERTISEMENTS_ENABLE}}" == "true" ]]; then
             route_advertisements_enable_flag="--enable-route-advertisements"
           fi
-
-          evpn_enable_flag=
-          if [[ "{{.OVN_EVPN_ENABLE}}" == "true" ]]; then
-            evpn_enable_flag="--enable-evpn"
-          fi
 
           multi_network_policy_enabled_flag=
           if [[ "{{.OVN_MULTI_NETWORK_POLICY_ENABLE}}" == "true" ]]; then
@@ -239,7 +234,6 @@ spec:
             ${persistent_ips_enabled_flag} \
             ${multi_network_policy_enabled_flag} \
             ${route_advertisements_enable_flag} \
-            ${evpn_enable_flag} \
             ${ovn_eip_reachability_timeout_opt}
         volumeMounts:
         - mountPath: /run/ovnkube-config/

bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml

@@ -115,11 +115,6 @@ spec:
           if [[ "{{.OVN_ROUTE_ADVERTISEMENTS_ENABLE}}" == "true" ]]; then
             route_advertisements_enable_flag="--enable-route-advertisements"
           fi
-
-          evpn_enable_flag=
-          if [[ "{{.OVN_EVPN_ENABLE}}" == "true" ]]; then
-            evpn_enable_flag="--enable-evpn"
-          fi
 
           multi_network_policy_enabled_flag=
           if [[ "{{.OVN_MULTI_NETWORK_POLICY_ENABLE}}" == "true" ]]; then
@@ -161,7 +156,6 @@ spec:
             ${multi_network_policy_enabled_flag} \
             ${gateway_mode_flags} \
             ${route_advertisements_enable_flag} \
-            ${evpn_enable_flag} \
             ${ovn_eip_reachability_timeout_opt}
         volumeMounts:
         - mountPath: /run/ovnkube-config/

go.mod

@@ -98,7 +98,7 @@ require (
 )
 
 require (
-	github.com/openshift/api v0.0.0-20260724065811-356624ff036f
+	github.com/openshift/api v0.0.0-20260820183036-3db6c4b03286
 	github.com/openshift/client-go v0.0.0-20260715172546-dac61734e0ec
 	github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e
 	github.com/openshift/library-go v0.0.0-20260716164659-7926d144f96a

go.sum

@@ -200,8 +200,8 @@ github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps
 github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
 github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc=
 github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A=
-github.com/openshift/api v0.0.0-20260724065811-356624ff036f h1:jGACG1DZvxDvRvH76Eh6SsXO1pVNsOqzMmvau1Oc4bc=
-github.com/openshift/api v0.0.0-20260724065811-356624ff036f/go.mod h1:k6qH5QOVa5GDln2VVm8Jz4NV3Z7R2SATHFLwGS6Wh3M=
+github.com/openshift/api v0.0.0-20260820183036-3db6c4b03286 h1:zz+Bfuhq9gAlbICRli8wk9CKgGmRMe5yQSxzvnmX73Q=
+github.com/openshift/api v0.0.0-20260820183036-3db6c4b03286/go.mod h1:k6qH5QOVa5GDln2VVm8Jz4NV3Z7R2SATHFLwGS6Wh3M=
 github.com/openshift/build-machinery-go v0.0.0-20260427155009-b879704ce51f h1:1BFlEUEcsxW1gNx64MxQQwgJDuuJxg5i7zUeOkla3QU=
 github.com/openshift/build-machinery-go v0.0.0-20260427155009-b879704ce51f/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20260715172546-dac61734e0ec h1:UDjX+mot5IVLpcChyBqLXG1oSB29s4UkqFmgNb0Xsqc=

pkg/network/ovn_kubernetes.go

@@ -417,13 +417,6 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
 	data.Data["OVN_NETWORK_CONNECT_ENABLE"] = featureGates.Enabled(apifeatures.FeatureGateNetworkConnect)
 	data.Data["OVN_OBSERVABILITY_ENABLE"] = featureGates.Enabled(apifeatures.FeatureGateOVNObservability)
 	data.Data["OVN_ROUTE_ADVERTISEMENTS_ENABLE"] = c.RouteAdvertisements == operv1.RouteAdvertisementsEnabled
-	// OVN_EVPN_ENABLE_API depends only on the feature gate and controls whether EVPN fields
-	// are present in the CUDN CRD schema. It must remain stable regardless of runtime config
-	// to avoid removing API fields and potentially losing data from existing custom resources.
-	// OVN_EVPN_ENABLE depends on both the feature gate and route advertisements being enabled,
-	// and controls deployment of EVPN runtime components (VTEP CRD, RBAC, FRR containers).
-	data.Data["OVN_EVPN_ENABLE_API"] = featureGates.Enabled(apifeatures.FeatureGateEVPN)
-	data.Data["OVN_EVPN_ENABLE"] = featureGates.Enabled(apifeatures.FeatureGateEVPN) && c.RouteAdvertisements == operv1.RouteAdvertisementsEnabled
 
 	data.Data["ReachabilityTotalTimeoutSeconds"] = c.EgressIPConfig.ReachabilityTotalTimeoutSeconds
 

pkg/network/ovn_kubernetes_test.go

@@ -78,7 +78,7 @@ var manifestDirOvn = "../../bindata"
 func getDefaultFeatureGates() featuregates.FeatureGate {
 	return featuregates.NewFeatureGate(
 		[]configv1.FeatureGateName{apifeatures.FeatureGateDNSNameResolver, apifeatures.FeatureGateOVNObservability, apifeatures.FeatureGateNoOverlayMode},
-		[]configv1.FeatureGateName{apifeatures.FeatureGateEVPN, apifeatures.FeatureGateNetworkConnect},
+		[]configv1.FeatureGateName{apifeatures.FeatureGateNetworkConnect},
 	)
 }
 
@@ -1101,7 +1101,6 @@ logfile-maxage=0`,
 				apifeatures.FeatureGateDNSNameResolver,
 				apifeatures.FeatureGateNetworkConnect,
 				apifeatures.FeatureGateOVNObservability,
-				apifeatures.FeatureGateEVPN,
 				apifeatures.FeatureGateNoOverlayMode,
 			}
 			s := sets.New[configv1.FeatureGateName](tc.enabledFeatureGates...)
@@ -4060,7 +4059,6 @@ func TestRenderOVNKubernetesEnablePersistentIPs(t *testing.T) {
 			apifeatures.FeatureGateNoOverlayMode,
 		},
 		[]configv1.FeatureGateName{
-			apifeatures.FeatureGateEVPN,
 			apifeatures.FeatureGateNetworkConnect,
 		},
 	)
@@ -4381,7 +4379,6 @@ func Test_renderOVNKubernetes(t *testing.T) {
 				apifeatures.FeatureGateDNSNameResolver,
 				apifeatures.FeatureGateNetworkConnect,
 				apifeatures.FeatureGateOVNObservability,
-				apifeatures.FeatureGateEVPN,
 				apifeatures.FeatureGateNoOverlayMode,
 			},
 		)
@@ -4393,7 +4390,6 @@ func Test_renderOVNKubernetes(t *testing.T) {
 				apifeatures.FeatureGateDNSNameResolver,
 				apifeatures.FeatureGateNetworkConnect,
 				apifeatures.FeatureGateOVNObservability,
-				apifeatures.FeatureGateEVPN,
 				apifeatures.FeatureGateNoOverlayMode,
 			},
 		)
@@ -4405,7 +4401,6 @@ func Test_renderOVNKubernetes(t *testing.T) {
 				apifeatures.FeatureGateDNSNameResolver,
 				apifeatures.FeatureGateNetworkConnect,
 				apifeatures.FeatureGateOVNObservability,
-				apifeatures.FeatureGateEVPN,
 				apifeatures.FeatureGateNoOverlayMode,
 			},
 		)
@@ -4818,7 +4813,6 @@ func TestRenderOVNKubernetesNoOverlay(t *testing.T) {
 				apifeatures.FeatureGateNoOverlayMode,
 			},
 			[]configv1.FeatureGateName{
-				apifeatures.FeatureGateEVPN,
 				apifeatures.FeatureGateNetworkConnect,
 			},
 		)