commit f49e17dae8846684f153e5552f43d931048abf51 · pyrox.dev/nixpkgs

+19 -7
nixos/modules/services/cluster/k3s/default.nix
···

       46
       46
        
             )

     

       47
       47
        
           );

     

       48
       48
        
       

     

       49
       49
       -
         # Replace characters that are problematic in file names

     

       49
       49
       +
         # Replace prefixes and characters that are problematic in file names

     

       50
       50
        
         cleanHelmChartName =

     

       51
       51
       +
           name:

     

       52
       52
       +
           let

     

       53
       53
       +
             woPrefix = lib.removePrefix "https://" (lib.removePrefix "oci://" name);

     

       54
       54
       +
           in

     

       51
       55
        
           lib.replaceStrings

     

       52
       56
        
             [

     

       53
       57
        
               "/"

     
···

       56
       60
        
             [

     

       57
       61
        
               "-"

     

       58
       62
        
               "-"

     

       59
       59
       -
             ];

     

       63
       63
       +
             ]

     

       64
       64
       +
             woPrefix;

     

       60
       65
        
       

     

       61
       66
        
         # Fetch a Helm chart from a public registry. This only supports a basic Helm pull.

     

       62
       67
        
         fetchHelm =

     
···

       66
       71
        
             version,

     

       67
       72
        
             hash ? lib.fakeHash,

     

       68
       73
        
           }:

     

       69
       69
       -
           pkgs.runCommand (cleanHelmChartName "${lib.removePrefix "https://" repo}-${name}-${version}.tgz")

     

       74
       74
       +
           let

     

       75
       75
       +
             isOci = lib.hasPrefix "oci://" repo;

     

       76
       76
       +
             pullCmd = if isOci then repo else "--repo ${repo} ${name}";

     

       77
       77
       +
             name' = if isOci then "${repo}-${version}" else "${repo}-${name}-${version}";

     

       78
       78
       +
           in

     

       79
       79
       +
           pkgs.runCommand (cleanHelmChartName "${name'}.tgz")

     

       70
       80
        
             {

     

       71
       81
        
               inherit (lib.fetchers.normalizeHash { } { inherit hash; }) outputHash outputHashAlgo;

     

       72
       82
        
               impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     
···

       76
       86
        
               ];

     

       77
       87
        
             }

     

       78
       88
        
             ''

     

       79
       79
       -
               export HOME="$PWD"

     

       80
       80
       -
               helm repo add repository ${repo}

     

       81
       81
       -
               helm pull repository/${name} --version ${version}

     

       89
       89
       +
               helm pull ${pullCmd} --version ${version}

     

       82
       90
        
               mv ./*.tgz $out

     

       83
       91
        
             '';

     

       84
       92
        
       

     
···

       724
       732
        
                     };

     

       725
       733
        
                   };

     

       726
       734
        
                 };

     

       727
       727
       -
       

     

       735
       735
       +
                 nginx = {

     

       736
       736
       +
                   repo = "oci://registry-1.docker.io/bitnamicharts/nginx";

     

       737
       737
       +
                   version = "20.0.0";

     

       738
       738
       +
                   hash = "sha256-sy+tzB+i9jIl/tqOMzzuhVhTU4EZVsoSBtPznxF/36c=";

     

       739
       739
       +
                 };

     

       728
       740
        
                 custom-chart = {

     

       729
       741
        
                   package = ../charts/my-chart.tgz;

     

       730
       742
        
                   values = ../values/my-values.yaml;