Merge pull request #1633 from gravitl/bugfix_v0.16.1_server_ingress

ipv6 ingress not supported on server
This commit is contained in:
Alex Feiszli 2022-10-05 14:33:32 -04:00 committed by GitHub
commit 8a3e35edc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,6 +47,10 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
postUpCmd := ""
postDownCmd := ""
ipv4, ipv6 := getNetworkProtocols(gateway.Ranges)
//no support for ipv6 and ip6tables in netmaker container
if node.IsServer == "yes" {
ipv6 = false
}
logger.Log(3, "creating egress gateway firewall in use is '", node.FirewallInUse, "'")
if node.OS == "linux" {
switch node.FirewallInUse {
@ -199,6 +203,10 @@ func CreateIngressGateway(netid string, nodeid string, failover bool) (models.No
node.IngressGatewayRange = network.AddressRange
node.IngressGatewayRange6 = network.AddressRange6
ipv4, ipv6 := getNetworkProtocols(cidrs)
//no support for ipv6 and ip6tables in netmaker container
if node.IsServer == "yes" {
ipv6 = false
}
logger.Log(3, "creating ingress gateway firewall in use is '", node.FirewallInUse, "'")
switch node.FirewallInUse {
case models.FIREWALL_NFTABLES: