diff --git a/pkgs/by-name/ku/kuma-cp/package.nix b/pkgs/by-name/ku/kuma-cp/package.nix new file mode 100644 index 000000000000..72943688219c --- /dev/null +++ b/pkgs/by-name/ku/kuma-cp/package.nix @@ -0,0 +1,13 @@ +{ + kuma, + ... +}@args: + +kuma.override ( + { + pname = "kumactl"; + isFull = false; + components = [ "kumactl" ]; + } + // removeAttrs args [ "kuma" ] +) diff --git a/pkgs/by-name/ku/kuma-dp/package.nix b/pkgs/by-name/ku/kuma-dp/package.nix new file mode 100644 index 000000000000..fc21766a6aff --- /dev/null +++ b/pkgs/by-name/ku/kuma-dp/package.nix @@ -0,0 +1,13 @@ +{ + kuma, + ... +}@args: + +kuma.override ( + { + pname = "kuma-dp"; + isFull = false; + components = [ "kuma-dp" ]; + } + // removeAttrs args [ "kuma" ] +) diff --git a/pkgs/by-name/ku/kuma-experimental/package.nix b/pkgs/by-name/ku/kuma-experimental/package.nix new file mode 100644 index 000000000000..ce40b14f9fd2 --- /dev/null +++ b/pkgs/by-name/ku/kuma-experimental/package.nix @@ -0,0 +1,14 @@ +{ + kuma, + ... +}@args: + +kuma.override ( + { + pname = "kuma-experimental"; + isFull = true; + enableGateway = true; + + } + // removeAttrs args [ "kuma" ] +) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/by-name/ku/kuma/package.nix similarity index 98% rename from pkgs/applications/networking/cluster/kuma/default.nix rename to pkgs/by-name/ku/kuma/package.nix index a2d3ff4d459e..38458ff7813a 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/by-name/ku/kuma/package.nix @@ -5,7 +5,7 @@ buildGoModule, coredns, installShellFiles, - isFull ? false, + isFull ? true, enableGateway ? false, pname ? "kuma", components ? lib.optionals isFull [ diff --git a/pkgs/by-name/ku/kumactl/package.nix b/pkgs/by-name/ku/kumactl/package.nix new file mode 100644 index 000000000000..72943688219c --- /dev/null +++ b/pkgs/by-name/ku/kumactl/package.nix @@ -0,0 +1,13 @@ +{ + kuma, + ... +}@args: + +kuma.override ( + { + pname = "kumactl"; + isFull = false; + components = [ "kumactl" ]; + } + // removeAttrs args [ "kuma" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 388b6df04a4d..8d0e11e21108 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9453,25 +9453,6 @@ with pkgs; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; - kuma = callPackage ../applications/networking/cluster/kuma { isFull = true; }; - kuma-experimental = callPackage ../applications/networking/cluster/kuma { - isFull = true; - enableGateway = true; - pname = "kuma-experimental"; - }; - kumactl = callPackage ../applications/networking/cluster/kuma { - components = [ "kumactl" ]; - pname = "kumactl"; - }; - kuma-cp = callPackage ../applications/networking/cluster/kuma { - components = [ "kuma-cp" ]; - pname = "kuma-cp"; - }; - kuma-dp = callPackage ../applications/networking/cluster/kuma { - components = [ "kuma-dp" ]; - pname = "kuma-dp"; - }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };