From c7188fe301c79ba920869f27570e8bd77a17aefb Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:05:20 -0500 Subject: [PATCH 1/3] kubectl-gadget: move to by-name --- .../default.nix => by-name/ku/kubectl-gadget/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/kubectl-gadget/default.nix => by-name/ku/kubectl-gadget/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-gadget/default.nix rename to pkgs/by-name/ku/kubectl-gadget/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4e6490162f4..27890bbffb36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31259,8 +31259,6 @@ with pkgs; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; - kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { }; - kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; From a4ffcf5664f1a90922f3572f60c2cc2457370446 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:08:08 -0500 Subject: [PATCH 2/3] kubectl-gadget: 0.31.0 -> 0.32.0 --- pkgs/by-name/ku/kubectl-gadget/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 30e835ba2c0b..a72836b29dfe 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-f93PdSA3OGiUUXSQn0aUP3o5xfvjiq/3L3Bz9k4OigI="; + hash = "sha256-c6hy7B8zaU/LnTMAohc9KPzu1ocOVFJ9wL4GOIwxqkw="; }; - vendorHash = "sha256-lBfz0tzCWKEAAmpvjB2kUJ3aLjlzAjniIu/1aNE80Xg="; + vendorHash = "sha256-7HfYCHxQUapDo33IAzxCp2iaL4G7oOqK0KyjqbmbR/w="; CGO_ENABLED = 0; From 7a41a8c71d466c3b1091da22aa6fb383194f24e3 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:09:16 -0500 Subject: [PATCH 3/3] kubectl-gadget: add version test --- pkgs/by-name/ku/kubectl-gadget/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index a72836b29dfe..5126591d7960 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubectl-gadget, testers }: buildGoModule rec { pname = "kubectl-gadget"; @@ -28,6 +28,12 @@ buildGoModule rec { subPackages = [ "cmd/kubectl-gadget" ]; + passthru.tests.version = testers.testVersion { + package = kubectl-gadget; + command = "kubectl-gadget version || true"; # mask non-zero return code if no kubeconfig present + version = "v${version}"; + }; + meta = with lib; { description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF"; mainProgram = "kubectl-gadget";