[PR #2489] [MERGED] populate serving from primary routes #2689

Closed
opened 2025-12-29 03:22:22 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2489
Author: @kradalby
Created: 3/19/2025
Status: Merged
Merged: 3/28/2025
Merged by: @kradalby

Base: mainHead: kradalby/cli-primary


📝 Commits (4)

  • 5a46403 populate serving from primary routes
  • bffa642 also exit
  • 8bb3129 fix route update outside of connection
  • 36107a8 update expected test output, cli only shows service node

📊 Changes

5 files changed (+51 additions, -51 deletions)

View changed files

📝 cmd/headscale/cli/nodes.go (+1 -1)
📝 hscontrol/grpcv1.go (+10 -5)
📝 hscontrol/poll.go (+24 -26)
📝 hscontrol/types/node.go (+10 -13)
📝 integration/route_test.go (+6 -6)

📄 Description

Depends on #2464
Fixes #2480

the list-routes subcommand now shows the node that is serving the route, in the case of HA it will show the current one, and if there is a single node, it will always show that node.

image

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/2489 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 3/19/2025 **Status:** ✅ Merged **Merged:** 3/28/2025 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `kradalby/cli-primary` --- ### 📝 Commits (4) - [`5a46403`](https://github.com/juanfont/headscale/commit/5a464036f073ee12c6ac1b1d87752a7c1ae04bc1) populate serving from primary routes - [`bffa642`](https://github.com/juanfont/headscale/commit/bffa64219bfed50bb1979cf36bada530dd9207d7) also exit - [`8bb3129`](https://github.com/juanfont/headscale/commit/8bb3129e2616dc8643db2f9ba844d657aba40648) fix route update outside of connection - [`36107a8`](https://github.com/juanfont/headscale/commit/36107a82acf3e86dd532b85b928bb831810e14ee) update expected test output, cli only shows service node ### 📊 Changes **5 files changed** (+51 additions, -51 deletions) <details> <summary>View changed files</summary> 📝 `cmd/headscale/cli/nodes.go` (+1 -1) 📝 `hscontrol/grpcv1.go` (+10 -5) 📝 `hscontrol/poll.go` (+24 -26) 📝 `hscontrol/types/node.go` (+10 -13) 📝 `integration/route_test.go` (+6 -6) </details> ### 📄 Description Depends on #2464 Fixes #2480 the `list-routes` subcommand now shows the node that is serving the route, in the case of HA it will show the current one, and if there is a single node, it will always show that node. <img width="598" alt="image" src="https://github.com/user-attachments/assets/ea2d30b4-f80d-4b59-b59c-7607bc1be43a" /> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 03:22:22 +01:00
adam closed this issue 2025-12-29 03:22:22 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2689