commit 1c4fe4d409bdaf4f7ad8aac67e500ed3f26136c6 · pyrox.dev/nixpkgs

+20 -7
nixos/modules/services/networking/flannel.nix
···

       7
       7
        
       let

     

       8
       8
        
         cfg = config.services.flannel;

     

       9
       9
        
       

     

       10
       10
       -
         networkConfig = lib.filterAttrs (n: v: v != null) {

     

       11
       11
       -
           Network = cfg.network;

     

       12
       12
       -
           SubnetLen = cfg.subnetLen;

     

       13
       13
       -
           SubnetMin = cfg.subnetMin;

     

       14
       14
       -
           SubnetMax = cfg.subnetMax;

     

       15
       15
       -
           Backend = cfg.backend;

     

       16
       16
       -
         };

     

       10
       10
       +
         networkConfig =

     

       11
       11
       +
           (lib.filterAttrs (n: v: v != null) {

     

       12
       12
       +
             Network = cfg.network;

     

       13
       13
       +
             SubnetLen = cfg.subnetLen;

     

       14
       14
       +
             SubnetMin = cfg.subnetMin;

     

       15
       15
       +
             SubnetMax = cfg.subnetMax;

     

       16
       16
       +
             Backend = cfg.backend;

     

       17
       17
       +
           })

     

       18
       18
       +
           // cfg.extraNetworkConfig;

     

       17
       19
        
       in

     

       18
       20
        
       {

     

       19
       21
        
         options.services.flannel = {

     
···

       139
       141
        
               Type = "vxlan";

     

       140
       142
        
             };

     

       141
       143
        
           };

     

       144
       144
       +
       

     

       145
       145
       +
           extraNetworkConfig = lib.mkOption {

     

       146
       146
       +
             description = "Extra configuration to be added to the net-conf.json/etcd-backed network configuration.";

     

       147
       147
       +
             type = (pkgs.formats.json { }).type;

     

       148
       148
       +
             default = { };

     

       149
       149
       +
             example = {

     

       150
       150
       +
               EnableIPv6 = true;

     

       151
       151
       +
             };

     

       152
       152
       +
           };

     

       142
       153
        
         };

     

       143
       154
        
       

     

       144
       155
        
         config = lib.mkIf cfg.enable {

     
···

       183
       194
        
               RuntimeDirectory = "flannel";

     

       184
       195
        
             };

     

       185
       196
        
           };

     

       197
       197
       +
       

     

       198
       198
       +
           boot.kernelModules = [ "br_netfilter" ];

     

       186
       199
        
       

     

       187
       200
        
           services.etcd.enable = lib.mkDefault (

     

       188
       201
        
             cfg.storageBackend == "etcd" && cfg.etcd.endpoints == [ "http://127.0.0.1:2379" ]