Merge pull request #2784 from gravitl/master

master
gravitl · Jan 23, 2024 · 32598a2 · 32598a2
2 parents 058338f + 2d2cfe3
commit 32598a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
@@ -63,7 +63,6 @@ services:
     env_file: ./netmaker.env
     depends_on:
       - netmaker
-    restart: always
     volumes:
       - dnsconfig:/root/dnsconfig
   mq:

diff --git a/logic/extpeers.go b/logic/extpeers.go
@@ -67,6 +67,13 @@ func GetEgressRangesOnNetwork(client *models.ExtClient) ([]string, error) {
 			}
 		}
 	}
+	extclients := GetGwExtclients(client.IngressGatewayID, client.Network)
+	for _, extclient := range extclients {
+		if extclient.ClientID == client.ClientID {
+			continue
+		}
+		result = append(result, extclient.ExtraAllowedIPs...)
+	}
 
 	return result, nil
 }

diff --git a/logic/gateway.go b/logic/gateway.go
@@ -2,7 +2,6 @@ package logic
 
 import (
 	"errors"
-	"fmt"
 	"time"
 
 	"github.com/gravitl/netmaker/database"
@@ -89,7 +88,9 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
 	for i := len(gateway.Ranges) - 1; i >= 0; i-- {
 		// check if internet gateway IPv4
 		if gateway.Ranges[i] == "0.0.0.0/0" || gateway.Ranges[i] == "::/0" {
-			return models.Node{}, fmt.Errorf("create internet gateways on the remote client gateway")
+			// remove inet range
+			gateway.Ranges = append(gateway.Ranges[:i], gateway.Ranges[i+1:]...)
+			continue
 		}
 		normalized, err := NormalizeCIDR(gateway.Ranges[i])
 		if err != nil {