diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-07-12 11:47:21 -0300 |
---|---|---|
committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-07-12 17:58:00 -0300 |
commit | e4d5a9864a2102dbbc17adc765fd759db24a6edd (patch) | |
tree | 31604cfd852a4ac9fc80a358e15dbe6ca4f3a4d0 | |
parent | e72a3ac6b41a672f1d1c5760b5ee9485e65d3017 (diff) |
k3s: refactor passthru and expose k3s dependencies for update script
-rw-r--r-- | pkgs/applications/networking/cluster/k3s/builder.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 28e55da9b64d0..eeff2578efb73 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -417,16 +417,21 @@ buildGoModule rec { runHook postInstallCheck ''; - passthru.updateScript = updateScript; - - passthru.mkTests = - version: - let - k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); - in - lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s; - - passthru.tests = passthru.mkTests k3sVersion; + passthru = { + k3sCNIPlugins = k3sCNIPlugins; + k3sContainerd = k3sContainerd; + k3sRepo = k3sRepo; + k3sRoot = k3sRoot; + k3sServer = k3sServer; + mkTests = + version: + let + k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); + in + lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s; + tests = passthru.mkTests k3sVersion; + updateScript = updateScript; + }; meta = baseMeta; } |