Skip to content

Commit 778d025

Browse files
committed
Merge branch 'develop' of https://github.com/gravitl/netmaker into ACC-468
2 parents 2e3b640 + 6f61f8a commit 778d025

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

auth/host_session.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,15 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host, relayNodeId uui
245245
continue
246246
}
247247
if relayNodeId != uuid.Nil && !newNode.IsRelayed {
248-
newNode.IsRelayed = true
249-
newNode.RelayedBy = relayNodeId.String()
250-
slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
251-
if err := logic.UpsertNode(newNode); err != nil {
252-
slog.Error("failed to update node", "nodeid", relayNodeId.String())
248+
// check if relay node exists and acting as relay
249+
relaynode, err := logic.GetNodeByID(relayNodeId.String())
250+
if err == nil && relaynode.IsRelay {
251+
newNode.IsRelayed = true
252+
newNode.RelayedBy = relayNodeId.String()
253+
slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
254+
if err := logic.UpsertNode(newNode); err != nil {
255+
slog.Error("failed to update node", "nodeid", relayNodeId.String())
256+
}
253257
}
254258
}
255259
logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name)

release.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
21
# Netmaker v0.23.0
32

4-
## Whats New
5-
- Revamped Internet Gateways
6-
- MQ fallback
7-
- Deprecating TURN in favour of failover hosts on Pro
8-
- Switch to CoreDNS for DNS resolution
9-
- DNS is no longer managed with OS hosts file (/etc/hosts file)
10-
- Add support for RAC on mobile
3+
## Whats New ✨
4+
5+
- Revamped Internet Gateways: hosts and clients can now use internet gateways! More info [here](https://docs.netmaker.io/pro/internet-gateways.html)
6+
On community edition, internet gateways for clients can be accessed via the Remote Access tab.
7+
- PostUp and PostDown commands for clients
8+
- EMQX cloud support
9+
- Metadata for Remote Access Gateways
10+
11+
## What's Fixed/Improved 🛠
1112

12-
## What's Fixed
13-
- Expired nodes not getting deleted
14-
- NMCTL acl subcommand leading to dirty state
15-
- Enforce private network ranges
16-
- Minor bugs and enhacements with user management
17-
- Scalability issues
13+
- Allow creation of gateways, relays and egress without clients, relayed hosts and external ranges respectively
14+
- Make default host a remote access gateway and a failover host on joining a new network
15+
- Stability fixes with ACLs
16+
- Fixed issues with install/upgrade scripts
17+
- Fixed issues with CoreDNS
1818

19-
## Known issues
19+
## Known Issues 🐞

0 commit comments

Comments
 (0)