[PR #2828] [MERGED] expire nodes with a custom timestamp #2885

Closed
opened 2025-12-29 04:19:30 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2828
Author: @bobelev
Created: 10/28/2025
Status: Merged
Merged: 11/1/2025
Merged by: @kradalby

Base: mainHead: bblv/expire-ts


📝 Commits (2)

  • 1d79372 chore(gen): add expiry field to ExpireNodeRequest
  • 0b05155 feat: expire nodes with a custom expiry time

📊 Changes

16 files changed (+191 additions, -25 deletions)

View changed files

📝 .github/workflows/test-integration.yaml (+1 -0)
📝 CHANGELOG.md (+5 -0)
📝 cmd/headscale/cli/nodes.go (+27 -0)
📝 gen/go/headscale/v1/apikey.pb.go (+1 -1)
📝 gen/go/headscale/v1/device.pb.go (+1 -1)
📝 gen/go/headscale/v1/headscale.pb.go (+1 -1)
📝 gen/go/headscale/v1/headscale.pb.gw.go (+14 -0)
📝 gen/go/headscale/v1/node.pb.go (+23 -13)
📝 gen/go/headscale/v1/policy.pb.go (+1 -1)
📝 gen/go/headscale/v1/preauthkey.pb.go (+1 -1)
📝 gen/go/headscale/v1/user.pb.go (+1 -1)
📝 gen/openapiv2/headscale/v1/headscale.swagger.json (+7 -0)
📝 hscontrol/db/node.go (+1 -3)
📝 hscontrol/grpcv1.go (+5 -2)
📝 integration/general_test.go (+98 -0)
📝 proto/headscale/v1/node.proto (+4 -1)

📄 Description

  • chore(gen): add expiry field to ExpireNodeRequest
  • feat: expire nodes with a custom expiry time

Small feature to set custom expiry date for nodes. Sometime it's needed to test expiration things, and it's very painful to do it manually.

  • have read the CONTRIBUTING.md file
  • raised a GitHub issue or discussed it on the projects chat beforehand
  • added unit tests
  • added integration tests
  • updated documentation if needed
  • updated CHANGELOG.md

🔄 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/2828 **Author:** [@bobelev](https://github.com/bobelev) **Created:** 10/28/2025 **Status:** ✅ Merged **Merged:** 11/1/2025 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `bblv/expire-ts` --- ### 📝 Commits (2) - [`1d79372`](https://github.com/juanfont/headscale/commit/1d793722eaac2fe0185c06e85dff12936f5b2288) chore(gen): add expiry field to ExpireNodeRequest - [`0b05155`](https://github.com/juanfont/headscale/commit/0b051553ad420b45112f5705eeb775d2e5bbdc8e) feat: expire nodes with a custom expiry time ### 📊 Changes **16 files changed** (+191 additions, -25 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/test-integration.yaml` (+1 -0) 📝 `CHANGELOG.md` (+5 -0) 📝 `cmd/headscale/cli/nodes.go` (+27 -0) 📝 `gen/go/headscale/v1/apikey.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/device.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/headscale.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/headscale.pb.gw.go` (+14 -0) 📝 `gen/go/headscale/v1/node.pb.go` (+23 -13) 📝 `gen/go/headscale/v1/policy.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/preauthkey.pb.go` (+1 -1) 📝 `gen/go/headscale/v1/user.pb.go` (+1 -1) 📝 `gen/openapiv2/headscale/v1/headscale.swagger.json` (+7 -0) 📝 `hscontrol/db/node.go` (+1 -3) 📝 `hscontrol/grpcv1.go` (+5 -2) 📝 `integration/general_test.go` (+98 -0) 📝 `proto/headscale/v1/node.proto` (+4 -1) </details> ### 📄 Description - **chore(gen): add expiry field to ExpireNodeRequest** - **feat: expire nodes with a custom expiry time** Small feature to set custom expiry date for nodes. Sometime it's needed to test expiration things, and it's very painful to do it manually. - [x] have read the [CONTRIBUTING.md](./CONTRIBUTING.md) file - [ ] raised a GitHub issue or discussed it on the projects chat beforehand - [ ] added unit tests - [x] added integration tests - [ ] updated documentation if needed - [x] updated CHANGELOG.md --- <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 04:19:30 +01:00
adam closed this issue 2025-12-29 04:19:30 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2885