Include bgp remote peer capabilities in the sysdump by liyihuang · Pull Request #40719 · cilium/cilium

liyihuang · 2025-07-25T15:11:54Z

Get the remote bgp peer capabilities from GoBGP and change the API so cilium-dbg can get it from agent
new flag --caps for cilium-dbg bgp peers to print out remote BGP peer capabilities
Include cilium-dbg bgp peers --caps in the bugtool so cilium-sysdump can collect it
new flag --caps for cilium bgp peers to print out remote BGP peer capabilities with cilium-cli.

cilium-dbg output

k exec -it ds/cilium -n kube-system -- cilium-dbg bgp peers --caps
BGP neighbor is fd00:10::1, remote AS 65000
  Neighbor capabilities:
    route-refresh
    add-path:
         ipv4-unicast:   receive
         ipv6-unicast:   receive

    fqdn: name: router0, domain:
    long-lived-graceful-restart:
        ipv4-unicast, restart time 0 sec, forward flag set
        ipv6-unicast, restart time 0 sec, forward flag set

    multiprotocol: ipv4-unicast
    multiprotocol: ipv6-unicast
    cisco-route-refresh
    enhanced-route-refresh
    4-octet-as
    UnknownCapability(6)
    graceful-restart:
        restart flag set, notification flag set

Cilium CLI output

cilium bgp peers --caps
Node: bgpv2-cplane-dev-service-control-plane
BGP neighbor is fd00:10::1, remote AS 65000
  Neighbor capabilities:
    multiprotocol: ipv4-unicast
    multiprotocol: ipv6-unicast
    cisco-route-refresh
    enhanced-route-refresh
    4-octet-as
    UnknownCapability(6)
    graceful-restart:
        restart flag set, notification flag set

    route-refresh
    add-path:
         ipv4-unicast:  receive
         ipv6-unicast:  receive

    fqdn: name: router0, domain:
    long-lived-graceful-restart:
        ipv4-unicast, restart time 0 sec, forward flag set
        ipv6-unicast, restart time 0 sec, forward flag set

Node: bgpv2-cplane-dev-service-worker
BGP neighbor is fd00:10::1, remote AS 65000
  Neighbor capabilities:
    cisco-route-refresh
    enhanced-route-refresh
    add-path:
         ipv4-unicast:  receive
         ipv6-unicast:  receive

    graceful-restart:
        restart flag set, notification flag set

    long-lived-graceful-restart:
        ipv4-unicast, restart time 0 sec, forward flag set
        ipv6-unicast, restart time 0 sec, forward flag set

    route-refresh
    4-octet-as
    UnknownCapability(6)
    fqdn: name: router0, domain:
    multiprotocol: ipv4-unicast
    multiprotocol: ipv6-unicast

Fixes: #30785

Include bgp remote peer capabilities in the sysdump

liyihuang · 2025-07-25T21:07:29Z

/test

harsimran-pabla

Thanks @liyihuang for this change. I also suggest adding advertised capabilities, as they are equally important for troubleshooting.

pkg/bgpv1/api/printers.go

liyihuang · 2025-07-30T20:23:41Z

@harsimran-pabla
I know I still have some unresolved comments, and I can address them all in my next commit, including any new comments you might add.

btw here is the output where I followed and used more codes from gobgp client.

Cilium node: bgpv2-cplane-dev-service-control-plane
BGP neighbor is fd00:10::1, remote AS 65000
Neighbor capabilities:
        multiprotocol:
                ipv4-unicast: advertised and received
                ipv6-unicast: advertised and received
        route-refresh: advertised and received
        extended-nexthop: advertised
                Local:
                        nlri: ipv4-unicast, nexthop: ipv6
        UnknownCapability(6): received
        graceful-restart: advertised and received
                Local:
                        Restart time: 15 sec, notification flag set
                        ipv4-unicast
                        ipv6-unicast
                Remote:
                        notification flag set
        4-octet-as: advertised and received
        add-path: received
                Remote:
                        ipv4-unicast: receive
                        ipv6-unicast: receive
        enhanced-route-refresh: received
        long-lived-graceful-restart: received
                Remote:
                        ipv4-unicast, restart time 0 sec, forward flag set
                        ipv6-unicast, restart time 0 sec, forward flag set

        fqdn: advertised and received
                Local:
                        name: bgpv2-cplane-dev-service-control-plane
                        domain:
                Remote:
                        name: router0
                        domain:
        cisco-route-refresh: received
Cilium node: bgpv2-cplane-dev-service-worker
BGP neighbor is fd00:10::1, remote AS 65000
Neighbor capabilities:
        multiprotocol:
                ipv4-unicast: advertised and received
                ipv6-unicast: advertised and received
        route-refresh: advertised and received
        extended-nexthop: advertised
                Local:
                        nlri: ipv4-unicast, nexthop: ipv6
        UnknownCapability(6): received
        graceful-restart: advertised and received
                Local:
                        Restart time: 15 sec, notification flag set
                        ipv4-unicast
                        ipv6-unicast
                Remote:
                        notification flag set
        4-octet-as: advertised and received
        add-path: received
                Remote:
                        ipv4-unicast: receive
                        ipv6-unicast: receive
        enhanced-route-refresh: received
        long-lived-graceful-restart: received
                Remote:
                        ipv4-unicast, restart time 0 sec, forward flag set
                        ipv6-unicast, restart time 0 sec, forward flag set

        fqdn: advertised and received
                Local:
                        name: bgpv2-cplane-dev-service-worker
                        domain:
                Remote:
                        name: router0
                        domain:
        cisco-route-refresh: received

derailed

@liyihuang Nice work! I think this could be cleaned up a bit...

pkg/bgpv1/api/printers.go

This commit add the new BgpCapabilities, local-capabilities remote-capabilities in the API and use make generate-api to reflect the change. It also reads the local and remote capability from gobgp server and pass it to agent so it can be query by client-dbg later. Signed-off-by: Liyi Huang <liyi.huang@isovalent.com>

liyihuang · 2025-08-01T22:38:36Z

/test

pkg/bgpv1/api/printers.go

liyihuang · 2025-08-06T17:57:51Z

/test

liyihuang · 2025-08-06T18:19:14Z

/test

derailed

@liyihuang Thanks for the updates Liyi!

cilium-dbg/cmd/bgp_peer_get.go

harsimran-pabla

Thanks @liyihuang Change looks good 🚀

liyihuang · 2025-08-15T02:15:35Z

/test

joestringer

I have a few comments from a CLI perspective.

cilium-cli/cli/bgp.go

pkg/bgpv1/api/printers.go

This commit introduces a new flag to the BGP peers command to optionally display detailed capabilities of BGP peers. I referred to and used a lot of code from GoBGP to implement the printer from the following link https://github.com/osrg/gobgp/blob/master/cmd/gobgp/neighbor.go#L357-L499 update the bugtool config so cilium sysdump can collect the peer's capabilities Signed-off-by: Liyi Huang <liyi.huang@isovalent.com>

…m CLI Add new parameters in cilium CLI to print all peer capabilities for whole cluster. Signed-off-by: Liyi Huang <liyi.huang@isovalent.com>

liyihuang · 2025-08-19T19:51:39Z

/test

… ) (#222) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [aqua:cilium/cilium-cli](https://redirect.github.com/cilium/cilium-cli) | patch | `0.18.6` -> `0.18.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>cilium/cilium-cli (aqua:cilium/cilium-cli)</summary> ### [`v0.18.7`](https://redirect.github.com/cilium/cilium-cli/releases/tag/v0.18.7) [Compare Source](https://redirect.github.com/cilium/cilium-cli/compare/v0.18.6...v0.18.7) #### What's Changed ## Summary of Changes **Minor Changes:** - clustermesh: cli: accept more than one service IPs (excluding when connecting to NodePort Services) when connecting to remote clustermesh-apiserver ([cilium/cilium#41253](https://redirect.github.com/cilium/cilium/issues/41253), [@MrFreezeex](https://redirect.github.com/MrFreezeex)) - clustermesh: cli: add support for dict for helm values `clustermesh.config.clusters` ([cilium/cilium#40879](https://redirect.github.com/cilium/cilium/issues/40879), [@MrFreezeex](https://redirect.github.com/MrFreezeex)) - clustermesh: cli: support outputting `clustermesh.config.clusters` to the new dict format if the cluster is running Cilium >= 1.20 ([cilium/cilium#40959](https://redirect.github.com/cilium/cilium/issues/40959), [@MrFreezeex](https://redirect.github.com/MrFreezeex)) **Bugfixes:** - Add l7 proxy check to policy-local-cluster-egress connectivity test ([cilium/cilium#40797](https://redirect.github.com/cilium/cilium/issues/40797), [@camrynl](https://redirect.github.com/camrynl)) - cilium-cli: also restart cilium-operator pods on config changes ([cilium/cilium#41067](https://redirect.github.com/cilium/cilium/issues/41067), [@aanm](https://redirect.github.com/aanm)) **CI Changes:** - Allow Egress Gateway connectivity tests to run concurrently ([cilium/cilium#40980](https://redirect.github.com/cilium/cilium/issues/40980), [@tommyp1ckles](https://redirect.github.com/tommyp1ckles)) - cilium-cli: connectivity tests: Ignore some logs in error log check ([cilium/cilium#40690](https://redirect.github.com/cilium/cilium/issues/40690), [@jrife](https://redirect.github.com/jrife)) - cilium-cli: IPv6 connectivity tests for PodToIngress ([cilium/cilium#39667](https://redirect.github.com/cilium/cilium/issues/39667), [@gentoo-root](https://redirect.github.com/gentoo-root)) **Misc Changes:** - chore(deps): update all-dependencies (main) ([cilium/cilium#40893](https://redirect.github.com/cilium/cilium/issues/40893), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - chore(deps): update all-dependencies (main) ([cilium/cilium#41046](https://redirect.github.com/cilium/cilium/issues/41046), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - chore(deps): update all-dependencies (main) ([cilium/cilium#41340](https://redirect.github.com/cilium/cilium/issues/41340), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - chore(deps): update all-dependencies (main) ([cilium/cilium#41433](https://redirect.github.com/cilium/cilium/issues/41433), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - chore(deps): update docker.io/library/golang:1.25.0 docker digest to [`5502b0e`](https://redirect.github.com/cilium/cilium-cli/commit/5502b0e) (main) ([cilium/cilium#41343](https://redirect.github.com/cilium/cilium/issues/41343), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - chore(deps): update go to v1.24.6 (main) ([cilium/cilium#40992](https://redirect.github.com/cilium/cilium/issues/40992), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - cilium-cli: Optimized feature detection by running cluster-wide checks once ([cilium/cilium#40715](https://redirect.github.com/cilium/cilium/issues/40715), [@HadrienPatte](https://redirect.github.com/HadrienPatte)) - Include bgp remote peer capabilities in the sysdump ([cilium/cilium#40719](https://redirect.github.com/cilium/cilium/issues/40719), [@liyihuang](https://redirect.github.com/liyihuang)) - Update all-dependencies (main) ([cilium/cilium#41175](https://redirect.github.com/cilium/cilium/issues/41175), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - Update docker.io/alpine/socat:1.8.0.3 Docker digest to [`29d0f24`](https://redirect.github.com/cilium/cilium-cli/commit/29d0f24) (main) ([cilium/cilium#41204](https://redirect.github.com/cilium/cilium/issues/41204), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - Update Go to v1.25.0 (main) ([cilium/cilium#41209](https://redirect.github.com/cilium/cilium/issues/41209), [@cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot]) - Update stable release to v0.18.6 by [@tklauser](https://redirect.github.com/tklauser) in [#3075](https://redirect.github.com/cilium/cilium-cli/pull/3075) - chore(deps): update golangci/golangci-lint docker tag to v2.3.1 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3076](https://redirect.github.com/cilium/cilium-cli/pull/3076) - chore(deps): update golang docker tag to v1.24.6 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3079](https://redirect.github.com/cilium/cilium-cli/pull/3079) - chore(deps): update gcr.io/distroless/static:latest docker digest to [`2e114d2`](https://redirect.github.com/cilium/cilium-cli/commit/2e114d2) by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3077](https://redirect.github.com/cilium/cilium-cli/pull/3077) - chore(deps): update docker/login-action action to v3.5.0 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3078](https://redirect.github.com/cilium/cilium-cli/pull/3078) - chore(deps): update go to v1.24.6 (patch) by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3080](https://redirect.github.com/cilium/cilium-cli/pull/3080) - chore(deps): update actions/checkout action to v5 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3082](https://redirect.github.com/cilium/cilium-cli/pull/3082) - chore(deps): update golangci/golangci-lint docker tag to v2.4.0 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3086](https://redirect.github.com/cilium/cilium-cli/pull/3086) - chore(deps): update golang docker tag to v1.25.0 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3085](https://redirect.github.com/cilium/cilium-cli/pull/3085) - chore(deps): update go to v1.25.0 (minor) by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3088](https://redirect.github.com/cilium/cilium-cli/pull/3088) - chore(deps): update dependency cilium/cilium to v1.18.1 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3089](https://redirect.github.com/cilium/cilium-cli/pull/3089) - chore(deps): update dependency kubernetes-sigs/kind to v0.30.0 by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3091](https://redirect.github.com/cilium/cilium-cli/pull/3091) - chore(deps): update golang-images - autoclosed by [@renovate](https://redirect.github.com/renovate)\[bot] in [#3090](https://redirect.github.com/cilium/cilium-cli/pull/3090) - Prepare for v0.18.7 release by [@michi-covalent](https://redirect.github.com/michi-covalent) in [#3092](https://redirect.github.com/cilium/cilium-cli/pull/3092) **Full Changelog**: <cilium/cilium-cli@v0.18.6...v0.18.7> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate).  Co-authored-by: zocimek-renovate[bot] <134739422+zocimek-renovate[bot]@users.noreply.github.com> Co-authored-by: Łukasz Pospiech <zocimek@users.noreply.github.com>

liyihuang added release-note/misc This PR makes changes that have no direct user impact. area/bgp Impacts the Border Gateway Protocol feature. labels Jul 25, 2025

github-actions bot added the cilium-cli This PR contains changes related with cilium-cli label Jul 25, 2025

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch 3 times, most recently from 59fea50 to b5e54ff Compare July 25, 2025 20:25

liyihuang marked this pull request as ready for review July 25, 2025 23:59

liyihuang requested review from a team as code owners July 25, 2025 23:59

liyihuang requested review from derailed, harsimran-pabla and squeed July 25, 2025 23:59

squeed approved these changes Jul 29, 2025

View reviewed changes

harsimran-pabla requested changes Jul 29, 2025

View reviewed changes

This comment was marked as duplicate.

Sign in to view

derailed requested changes Jul 31, 2025

View reviewed changes

pkg/bgpv1/api/printers.go Outdated Show resolved Hide resolved

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch from b5e54ff to 8660097 Compare August 1, 2025 19:35

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch 2 times, most recently from 1854d76 to c5feb58 Compare August 1, 2025 21:36

harsimran-pabla requested changes Aug 4, 2025

View reviewed changes

pkg/bgpv1/api/printers.go Outdated Show resolved Hide resolved

pkg/bgpv1/api/printers.go Outdated Show resolved Hide resolved

pkg/bgpv1/api/printers.go Show resolved Hide resolved

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch from c5feb58 to 2eb63c5 Compare August 6, 2025 17:57

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch from 2eb63c5 to 2a8f16f Compare August 6, 2025 18:13

maintainer-s-little-helper bot requested a review from derailed August 6, 2025 19:06

maintainer-s-little-helper bot requested a review from harsimran-pabla August 6, 2025 19:06

derailed approved these changes Aug 6, 2025

View reviewed changes

harsimran-pabla reviewed Aug 14, 2025

View reviewed changes

cilium-dbg/cmd/bgp_peer_get.go Outdated Show resolved Hide resolved

maintainer-s-little-helper bot requested a review from harsimran-pabla August 14, 2025 17:31

harsimran-pabla approved these changes Aug 14, 2025

View reviewed changes

maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 14, 2025

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch 2 times, most recently from 2377d67 to bfeaf83 Compare August 14, 2025 19:25

joestringer reviewed Aug 19, 2025

View reviewed changes

cilium-cli/cli/bgp.go Outdated Show resolved Hide resolved

pkg/bgpv1/api/printers.go Outdated Show resolved Hide resolved

pkg/bgpv1/api/printers.go Outdated Show resolved Hide resolved

joestringer removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 19, 2025

maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 19, 2025

liyihuang added 2 commits August 19, 2025 15:19

bgp: add ShowCaps parameter to display BGP peer capabilities in Ciliu…

fd730aa

…m CLI Add new parameters in cilium CLI to print all peer capabilities for whole cluster. Signed-off-by: Liyi Huang <liyi.huang@isovalent.com>

liyihuang force-pushed the pr/liyihuang/include_bgp_peer_capabilities branch from bfeaf83 to fd730aa Compare August 19, 2025 19:24

joestringer approved these changes Aug 19, 2025

View reviewed changes

joestringer added this pull request to the merge queue Aug 19, 2025

Merged via the queue into cilium:main with commit 27d8676 Aug 19, 2025
68 checks passed

liyihuang deleted the pr/liyihuang/include_bgp_peer_capabilities branch September 19, 2025 14:10

cilium-release-bot bot added this to cilium v1.19.0 Feb 3, 2026

cilium-release-bot bot moved this to Released in cilium v1.19.0 Feb 3, 2026

liyihuang mentioned this pull request Feb 24, 2026

ladder: add liyihuang to sig-bgp team cilium/community#385

Merged

Conversation

liyihuang commented Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liyihuang commented Jul 25, 2025

Uh oh!

harsimran-pabla left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment was marked as duplicate.

Uh oh!

liyihuang commented Jul 30, 2025

Uh oh!

derailed left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

liyihuang commented Aug 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

liyihuang commented Aug 6, 2025

Uh oh!

liyihuang commented Aug 6, 2025

Uh oh!

derailed left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

harsimran-pabla left a comment

Choose a reason for hiding this comment

Uh oh!

liyihuang commented Aug 15, 2025

Uh oh!

joestringer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

liyihuang commented Aug 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

liyihuang commented Jul 25, 2025 •

edited

Loading