Merge branch '293-fix-ipv6' into develop

Author: tcaiazzi

src/Kathara/manager/docker/DockerMachine.py

@@ -252,6 +252,11 @@ def create(self, machine: Machine) -> None:
             sysctl_parameters["net.ipv6.icmp.ratelimit"] = 0
             sysctl_parameters["net.ipv6.conf.default.disable_ipv6"] = 0
             sysctl_parameters["net.ipv6.conf.all.disable_ipv6"] = 0
+        else:
+            sysctl_parameters["net.ipv6.conf.default.disable_ipv6"] = 1
+            sysctl_parameters["net.ipv6.conf.all.disable_ipv6"] = 1
+            sysctl_parameters["net.ipv6.conf.default.forwarding"] = 0
+            sysctl_parameters["net.ipv6.conf.all.forwarding"] = 0
 
         # Merge machine sysctls
         sysctl_parameters = {**sysctl_parameters, **machine.meta['sysctls'], **sysctl_first_interface}

src/Kathara/manager/kubernetes/KubernetesMachine.py

@@ -304,6 +304,11 @@ def create(self, machine: Machine) -> None:
             sysctl_parameters["net.ipv6.icmp.ratelimit"] = 0
             sysctl_parameters["net.ipv6.conf.default.disable_ipv6"] = 0
             sysctl_parameters["net.ipv6.conf.all.disable_ipv6"] = 0
+        else:
+            sysctl_parameters["net.ipv6.conf.default.disable_ipv6"] = 1
+            sysctl_parameters["net.ipv6.conf.all.disable_ipv6"] = 1
+            sysctl_parameters["net.ipv6.conf.default.forwarding"] = 0
+            sysctl_parameters["net.ipv6.conf.all.forwarding"] = 0
 
         # Merge machine sysctls
         machine.meta['sysctls'] = {**sysctl_parameters, **machine.meta['sysctls']}

tests/manager/docker/docker_machine_test.py

@@ -101,7 +101,11 @@ def test_create(mock_get_current_user_name, mock_setting_get_instance, mock_copy
                  'net.ipv4.conf.default.rp_filter': 0,
                  'net.ipv4.conf.lo.rp_filter': 0,
                  'net.ipv4.ip_forward': 1,
-                 'net.ipv4.icmp_ratelimit': 0
+                 'net.ipv4.icmp_ratelimit': 0,
+                 'net.ipv6.conf.default.disable_ipv6': 1,
+                 'net.ipv6.conf.all.disable_ipv6': 1,
+                 'net.ipv6.conf.default.forwarding': 0,
+                 'net.ipv6.conf.all.forwarding': 0,
                  },
         environment={},
         mem_limit='64m',
@@ -276,6 +280,10 @@ def __init__(self, name):
                  'net.ipv4.conf.lo.rp_filter': 0,
                  'net.ipv4.ip_forward': 1,
                  'net.ipv4.icmp_ratelimit': 0,
+                 'net.ipv6.conf.default.disable_ipv6': 1,
+                 'net.ipv6.conf.all.disable_ipv6': 1,
+                 'net.ipv6.conf.default.forwarding': 0,
+                 'net.ipv6.conf.all.forwarding': 0,
                  },
         environment={},
         mem_limit='64m',
@@ -340,6 +348,10 @@ def __init__(self, name):
                  'net.ipv4.conf.eth0.rp_filter': 0,
                  'net.ipv4.ip_forward': 1,
                  'net.ipv4.icmp_ratelimit': 0,
+                 'net.ipv6.conf.default.disable_ipv6': 1,
+                 'net.ipv6.conf.all.disable_ipv6': 1,
+                 'net.ipv6.conf.default.forwarding': 0,
+                 'net.ipv6.conf.all.forwarding': 0,
                  },
         environment={},
         mem_limit='64m',
@@ -411,6 +423,10 @@ def __init__(self, name):
                  'net.ipv4.conf.lo.rp_filter': 0,
                  'net.ipv4.ip_forward': 1,
                  'net.ipv4.icmp_ratelimit': 0,
+                 'net.ipv6.conf.default.disable_ipv6': 1,
+                 'net.ipv6.conf.all.disable_ipv6': 1,
+                 'net.ipv6.conf.default.forwarding': 0,
+                 'net.ipv6.conf.all.forwarding': 0,
                  },
         environment={},
         mem_limit='64m',
@@ -483,6 +499,10 @@ def __init__(self, name):
                  'net.ipv4.conf.eth0.rp_filter': 0,
                  'net.ipv4.ip_forward': 1,
                  'net.ipv4.icmp_ratelimit': 0,
+                 'net.ipv6.conf.default.disable_ipv6': 1,
+                 'net.ipv6.conf.all.disable_ipv6': 1,
+                 'net.ipv6.conf.default.forwarding': 0,
+                 'net.ipv6.conf.all.forwarding': 0,
                  },
         environment={},
         mem_limit='64m',

tests/manager/kubernetes/kubernetes_machine_test.py

@@ -52,7 +52,10 @@ def kubernetes_device_definition():
 
     sysctl_commands = "sysctl -w -q net.ipv4.conf.all.rp_filter=0; sysctl -w -q net.ipv4.conf.default.rp_filter=0; " \
                       "sysctl -w -q net.ipv4.conf.lo.rp_filter=0; sysctl -w -q net.ipv4.ip_forward=1; " \
-                      "sysctl -w -q net.ipv4.icmp_ratelimit=0"
+                      "sysctl -w -q net.ipv4.icmp_ratelimit=0; sysctl -w -q net.ipv6.conf.default.disable_ipv6=1; " \
+                      "sysctl -w -q net.ipv6.conf.all.disable_ipv6=1; sysctl -w -q net.ipv6.conf.default.forwarding=0; " \
+                      "sysctl -w -q net.ipv6.conf.all.forwarding=0"
+    
     startup_commands_string = "; ".join(STARTUP_COMMANDS) \
         .format(machine_name="test_device", sysctl_commands=sysctl_commands, machine_commands="ls")