Sfoglia il codice sorgente

Merge pull request #3493 from gravitl/v0.99_fixes

V0.99 fixes
Abhishek K 3 mesi fa
parent
commit
e3de513b92
2 ha cambiato i file con 2 aggiunte e 8 eliminazioni
  1. 1 5
      logic/egress.go
  2. 1 3
      logic/gateway.go

+ 1 - 5
logic/egress.go

@@ -39,16 +39,12 @@ func ValidateEgressReq(e *schema.Egress) error {
 func DoesNodeHaveAccessToEgress(node *models.Node, e *schema.Egress, acls []models.Acl) bool {
 	nodeTags := maps.Clone(node.Tags)
 	nodeTags[models.TagID(node.ID.String())] = struct{}{}
+	nodeTags[models.TagID("*")] = struct{}{}
 	for _, acl := range acls {
 		if !acl.Enabled {
 			continue
 		}
 		srcVal := ConvAclTagToValueMap(acl.Src)
-		if acl.AllowedDirection == models.TrafficDirectionBi {
-			if _, ok := srcVal["*"]; ok {
-				return true
-			}
-		}
 		for _, dstI := range acl.Dst {
 
 			if dstI.ID == models.NodeTagID && dstI.Value == "*" {

+ 1 - 3
logic/gateway.go

@@ -190,9 +190,7 @@ func CreateIngressGateway(netid string, nodeid string, ingress models.IngressReq
 	}
 	node.IsIngressGateway = true
 	node.IsGw = true
-	if !servercfg.IsPro {
-		node.IsInternetGateway = ingress.IsInternetGateway
-	}
+	node.IsInternetGateway = ingress.IsInternetGateway
 	node.IngressGatewayRange = network.AddressRange
 	node.IngressGatewayRange6 = network.AddressRange6
 	node.IngressDNS = ingress.ExtclientDNS