Skip to content

OCPBUGS-83406 OCPBUGS-83407: fix issue for managed mode of no-overlay #2960

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 2 commits into from
May 5, 2026
+15 −2
Merged

OCPBUGS-83406 OCPBUGS-83407: fix issue for managed mode of no-overlay #2960

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
a09d0c1
ovn-k: grant routeadvertisements CRUD to control-plane SA in managed …
zhaozhanqi Apr 2, 2026
7795779
frr-k8s: enable BGP daemon to listen on standard port 179
zhaozhanqi Apr 2, 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
2 changes: 1 addition & 1 deletion bindata/network/frr-k8s/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
#
vtysh_enable=yes
zebra_options=" -A 127.0.0.1 -s 90000000 --limit-fds 100000"
bgpd_options=" -A 127.0.0.1 -p 0 --limit-fds 100000"
bgpd_options=" -A 127.0.0.1 -p {{ if .NoOverlayManagedEnabled }}179{{ else }}0{{ end }} --limit-fds 100000"
Comment thread
arghosh93 marked this conversation as resolved.
Comment thread
arghosh93 marked this conversation as resolved.
ospfd_options=" -A 127.0.0.1"
ospf6d_options=" -A ::1"
ripd_options=" -A 127.0.0.1"
Expand Down
13 changes: 12 additions & 1 deletion bindata/network/ovn-kubernetes/common/004-rbac-control-plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ rules:
verbs:
- patch
- update
- apiGroups:
- apiGroups:
- frrk8s.metallb.io
resources:
- frrconfigurations
Expand All @@ -256,6 +256,17 @@ rules:
- update
- patch
{{- end}}
{{- if .NoOverlayManagedEnabled }}
- apiGroups:
- k8s.ovn.org
resources:
- routeadvertisements
verbs:
- create
- delete
- patch
- update
{{- end}}
{{- if .OVN_EVPN_ENABLE }}
- apiGroups:
- k8s.ovn.org
Expand Down
2 changes: 2 additions & 0 deletions pkg/network/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,8 @@ func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, manifestDir s
data := render.MakeRenderData()
data.Data["FRRK8sImage"] = os.Getenv("FRR_K8S_IMAGE")
data.Data["ReleaseVersion"] = os.Getenv("RELEASE_VERSION")
data.Data["NoOverlayManagedEnabled"] = conf.DefaultNetwork.OVNKubernetesConfig != nil &&
Comment thread
arghosh93 marked this conversation as resolved.
conf.DefaultNetwork.OVNKubernetesConfig.BGPManagedConfig.BGPTopology != ""
objs, err := render.RenderDir(filepath.Join(manifestDir, "network/frr-k8s"), &data)
if err != nil {
return nil, fmt.Errorf("failed to render frr-k8s manifests: %w", err)
Expand Down