commit 40a27ed8e72e3ac29dd4e703a488ffdc1cd16b1a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       530
       530
        
         };

     

       531
       531
        
         fish = runTest ./fish.nix;

     

       532
       532
        
         firezone = runTest ./firezone/firezone.nix;

     

       533
       533
       -
         flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };

     

       533
       533
       +
         flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix;

     

       534
       534
        
         flaresolverr = runTest ./flaresolverr.nix;

     

       535
       535
        
         flood = runTest ./flood.nix;

     

       536
       536
        
         floorp = runTest {

+46 -56

nixos/tests/flannel.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "flannel";

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "flannel";

     

       5
       4
        
       

     

       6
       6
       -
           meta = with lib.maintainers; {

     

       7
       7
       -
             maintainers = [ offline ];

     

       8
       8
       -
           };

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ offline ];

     

       9
       6
        
       

     

       10
       10
       -
           nodes =

     

       11
       11
       -
             let

     

       12
       12
       -
               flannelConfig =

     

       13
       13
       -
                 { pkgs, ... }:

     

       14
       14
       -
                 {

     

       15
       15
       -
                   services.flannel = {

     

       16
       16
       -
                     enable = true;

     

       17
       17
       -
                     backend = {

     

       18
       18
       -
                       Type = "udp";

     

       19
       19
       -
                       Port = 8285;

     

       20
       20
       -
                     };

     

       21
       21
       -
                     network = "10.1.0.0/16";

     

       22
       22
       -
                     iface = "eth1";

     

       23
       23
       -
                     etcd.endpoints = [ "http://etcd:2379" ];

     

       24
       24
       -
                   };

     

       25
       25
       -
       

     

       26
       26
       -
                   networking.firewall.allowedUDPPorts = [ 8285 ];

     

       7
       7
       +
         nodes =

     

       8
       8
       +
           let

     

       9
       9
       +
             flannelConfig = {

     

       10
       10
       +
               services.flannel = {

     

       11
       11
       +
                 enable = true;

     

       12
       12
       +
                 backend = {

     

       13
       13
       +
                   Type = "udp";

     

       14
       14
       +
                   Port = 8285;

     

       27
       15
        
                 };

     

       28
       28
       -
             in

     

       29
       29
       -
             {

     

       30
       30
       -
               etcd =

     

       31
       31
       -
                 { ... }:

     

       32
       32
       -
                 {

     

       33
       33
       -
                   services = {

     

       34
       34
       -
                     etcd = {

     

       35
       35
       -
                       enable = true;

     

       36
       36
       -
                       listenClientUrls = [ "http://0.0.0.0:2379" ]; # requires ip-address for binding

     

       37
       37
       -
                       listenPeerUrls = [ "http://0.0.0.0:2380" ]; # requires ip-address for binding

     

       38
       38
       -
                       advertiseClientUrls = [ "http://etcd:2379" ];

     

       39
       39
       -
                       initialAdvertisePeerUrls = [ "http://etcd:2379" ];

     

       40
       40
       -
                       initialCluster = [ "etcd=http://etcd:2379" ];

     

       41
       41
       -
                     };

     

       42
       42
       -
                   };

     

       16
       16
       +
                 network = "10.1.0.0/16";

     

       17
       17
       +
                 iface = "eth1";

     

       18
       18
       +
                 etcd.endpoints = [ "http://etcd:2379" ];

     

       19
       19
       +
               };

     

       43
       20
        
       

     

       44
       44
       -
                   networking.firewall.allowedTCPPorts = [ 2379 ];

     

       45
       45
       -
                 };

     

       21
       21
       +
               networking.firewall.allowedUDPPorts = [ 8285 ];

     

       22
       22
       +
             };

     

       23
       23
       +
           in

     

       24
       24
       +
           {

     

       25
       25
       +
             etcd = {

     

       26
       26
       +
               services.etcd = {

     

       27
       27
       +
                 enable = true;

     

       28
       28
       +
                 listenClientUrls = [ "http://0.0.0.0:2379" ]; # requires ip-address for binding

     

       29
       29
       +
                 listenPeerUrls = [ "http://0.0.0.0:2380" ]; # requires ip-address for binding

     

       30
       30
       +
                 advertiseClientUrls = [ "http://etcd:2379" ];

     

       31
       31
       +
                 initialAdvertisePeerUrls = [ "http://etcd:2379" ];

     

       32
       32
       +
                 initialCluster = [ "etcd=http://etcd:2379" ];

     

       33
       33
       +
               };

     

       46
       34
        
       

     

       47
       47
       -
               node1 = flannelConfig;

     

       48
       48
       -
               node2 = flannelConfig;

     

       35
       35
       +
               networking.firewall.allowedTCPPorts = [ 2379 ];

     

       49
       36
        
             };

     

       50
       37
        
       

     

       51
       51
       -
           testScript = ''

     

       52
       52
       -
             start_all()

     

       38
       38
       +
             node1 = flannelConfig;

     

       39
       39
       +
             node2 = flannelConfig;

     

       40
       40
       +
           };

     

       41
       41
       +
       

     

       42
       42
       +
         testScript = ''

     

       43
       43
       +
           start_all()

     

       53
       44
        
       

     

       54
       54
       -
             node1.wait_for_unit("flannel.service")

     

       55
       55
       -
             node2.wait_for_unit("flannel.service")

     

       45
       45
       +
           node1.wait_for_unit("flannel.service")

     

       46
       46
       +
           node2.wait_for_unit("flannel.service")

     

       56
       47
        
       

     

       57
       57
       -
             node1.wait_until_succeeds("ip l show dev flannel0")

     

       58
       58
       -
             ip1 = node1.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")

     

       59
       59
       -
             node2.wait_until_succeeds("ip l show dev flannel0")

     

       60
       60
       -
             ip2 = node2.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")

     

       48
       48
       +
           node1.wait_until_succeeds("ip l show dev flannel0")

     

       49
       49
       +
           ip1 = node1.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")

     

       50
       50
       +
           node2.wait_until_succeeds("ip l show dev flannel0")

     

       51
       51
       +
           ip2 = node2.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")

     

       61
       52
        
       

     

       62
       62
       -
             node1.wait_until_succeeds(f"ping -c 1 {ip2}")

     

       63
       63
       -
             node2.wait_until_succeeds(f"ping -c 1 {ip1}")

     

       64
       64
       -
           '';

     

       65
       65
       -
         }

     

       66
       66
       -
       )

     

       53
       53
       +
           node1.wait_until_succeeds(f"ping -c 1 {ip2}")

     

       54
       54
       +
           node2.wait_until_succeeds(f"ping -c 1 {ip1}")

     

       55
       55
       +
         '';

     

       56
       56
       +
       }