Browse Source

Merge branch 'develop' of https://github.com/gravitl/netmaker into ACC-468

abhishek9686 1 year ago
parent
commit
778d02581c
2 changed files with 24 additions and 20 deletions
  1. 9 5
      auth/host_session.go
  2. 15 15
      release.md

+ 9 - 5
auth/host_session.go

@@ -245,11 +245,15 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host, relayNodeId uui
 				continue
 			}
 			if relayNodeId != uuid.Nil && !newNode.IsRelayed {
-				newNode.IsRelayed = true
-				newNode.RelayedBy = relayNodeId.String()
-				slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
-				if err := logic.UpsertNode(newNode); err != nil {
-					slog.Error("failed to update node", "nodeid", relayNodeId.String())
+				// check if relay node exists and acting as relay
+				relaynode, err := logic.GetNodeByID(relayNodeId.String())
+				if err == nil && relaynode.IsRelay {
+					newNode.IsRelayed = true
+					newNode.RelayedBy = relayNodeId.String()
+					slog.Info(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), relayNodeId.String(), network))
+					if err := logic.UpsertNode(newNode); err != nil {
+						slog.Error("failed to update node", "nodeid", relayNodeId.String())
+					}
 				}
 			}
 			logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name)

+ 15 - 15
release.md

@@ -1,19 +1,19 @@
-
 # Netmaker v0.23.0
 
-## Whats New
-- Revamped Internet Gateways
-- MQ fallback
-- Deprecating TURN in favour of failover hosts on Pro
-- Switch to CoreDNS for DNS resolution
-- DNS is no longer managed with OS hosts file (/etc/hosts file)
-- Add support for RAC on mobile
+## Whats New ✨
+
+- Revamped Internet Gateways: hosts and clients can now use internet gateways! More info [here](https://docs.netmaker.io/pro/internet-gateways.html)
+  On community edition, internet gateways for clients can be accessed via the Remote Access tab.
+- PostUp and PostDown commands for clients
+- EMQX cloud support
+- Metadata for Remote Access Gateways
+
+## What's Fixed/Improved 🛠
 
-## What's Fixed
-- Expired nodes not getting deleted
-- NMCTL acl subcommand leading to dirty state
-- Enforce private network ranges
-- Minor bugs and enhacements with user management
-- Scalability issues
+- Allow creation of gateways, relays and egress without clients, relayed hosts and external ranges respectively
+- Make default host a remote access gateway and a failover host on joining a new network
+- Stability fixes with ACLs
+- Fixed issues with install/upgrade scripts
+- Fixed issues with CoreDNS
 
-## Known issues
+## Known Issues 🐞