gather-sysinfo: update debug-tools to v0.2.3 (#1347)

remove some (most?) technical debt related to gather-sysinfo and
debug-tools, bumping to v0.2.z.
This allows us to bump the cadvisor dep removing the pin.

Signed-off-by: Francesco Romani <fromani@redhat.com>

Author: ffromani

cmd/gather-sysinfo/gather-sysinfo.go

@@ -8,8 +8,8 @@ import (
 	"sort"
 
 	"github.com/jaypipes/ghw/pkg/snapshot"
-	"github.com/openshift-kni/debug-tools/pkg/knit/cmd"
-	"github.com/openshift-kni/debug-tools/pkg/knit/cmd/k8s"
+	"github.com/openshift-kni/debug-tools/pkg/cli/knit"
+	"github.com/openshift-kni/debug-tools/pkg/cli/knit/k8s"
 	"github.com/openshift-kni/debug-tools/pkg/machineinformer"
 	"github.com/spf13/cobra"
 )
@@ -23,7 +23,7 @@ type snapshotOptions struct {
 }
 
 func main() {
-	root := cmd.NewRootCommand(newSnapshotCommand,
+	root := knit.NewRootCommand(newSnapshotCommand,
 		k8s.NewPodResourcesCommand,
 		k8s.NewPodInfoCommand,
 	)
@@ -34,7 +34,7 @@ func main() {
 	}
 }
 
-func newSnapshotCommand(knitOpts *cmd.KnitOptions) *cobra.Command {
+func newSnapshotCommand(knitOpts *knit.KnitOptions) *cobra.Command {
 	opts := &snapshotOptions{}
 	snap := &cobra.Command{
 		Use:   "snapshot",
@@ -51,7 +51,7 @@ func newSnapshotCommand(knitOpts *cmd.KnitOptions) *cobra.Command {
 	return snap
 }
 
-func collectMachineinfo(knitOpts *cmd.KnitOptions, destPath string) error {
+func collectMachineinfo(knitOpts *knit.KnitOptions, destPath string) error {
 	outfile, err := os.Create(destPath)
 	if err != nil {
 		return err
@@ -66,7 +66,7 @@ func collectMachineinfo(knitOpts *cmd.KnitOptions, destPath string) error {
 	return nil
 }
 
-func makeSnapshot(cmd *cobra.Command, knitOpts *cmd.KnitOptions, opts *snapshotOptions, args []string) error {
+func makeSnapshot(cmd *cobra.Command, knitOpts *knit.KnitOptions, opts *snapshotOptions, args []string) error {
 	fileSpecs := dedupExpectedContent(kniExpectedCloneContent(), snapshot.ExpectedCloneContent())
 	if opts.dumpList {
 		for _, fileSpec := range fileSpecs {

cmd/gather-sysinfo/gather-sysinfo_test.go

@@ -5,9 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/openshift-kni/debug-tools/pkg/knit/cmd"
 	"github.com/spf13/cobra"
 	"k8s.io/utils/strings/slices"
+
+	"github.com/openshift-kni/debug-tools/pkg/cli/knit"
 )
 
 var kniEntries = []string{
@@ -29,7 +30,7 @@ var kniEntries = []string{
 
 func TestCollectMachineInfo(t *testing.T) {
 	//Check if collect machine info file is created correctly
-	knitOpts := &cmd.KnitOptions{}
+	knitOpts := &knit.KnitOptions{}
 	knitOpts.SysFSRoot = "/host/sys"
 
 	destFile := "./output"
@@ -61,7 +62,7 @@ func TestChroot(t *testing.T) {
 }
 
 func TestSnapshot(t *testing.T) {
-	knitOpts := &cmd.KnitOptions{}
+	knitOpts := &knit.KnitOptions{}
 
 	opts := &snapshotOptions{}
 	cmd := &cobra.Command{}

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/kevinburke/go-bindata v3.24.0+incompatible
 	github.com/onsi/ginkgo/v2 v2.22.1
 	github.com/onsi/gomega v1.36.2
-	github.com/openshift-kni/debug-tools v0.1.12
+	github.com/openshift-kni/debug-tools v0.2.3
 	github.com/openshift-kni/k8sreporter v1.0.6
 	github.com/openshift/api v0.0.0-20250407083304-00e6260bd8b8
 	github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2
@@ -32,14 +32,14 @@ require (
 	gopkg.in/fsnotify.v1 v1.4.7
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.32.3
+	k8s.io/api v0.32.6
 	k8s.io/apiextensions-apiserver v0.32.3
-	k8s.io/apimachinery v0.32.3
-	k8s.io/client-go v0.32.3
+	k8s.io/apimachinery v0.32.6
+	k8s.io/client-go v0.32.6
 	k8s.io/code-generator v0.32.3
 	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubelet v0.32.3
+	k8s.io/kubelet v0.32.6
 	k8s.io/kubernetes v1.32.3
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
 	kubevirt.io/qe-tools v0.1.8
@@ -61,14 +61,16 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect
-	github.com/containerd/console v1.0.4 // indirect
+	github.com/containerd/containerd/api v1.8.0 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/ttrpc v1.2.5 // indirect
+	github.com/containerd/ttrpc v1.2.6 // indirect
+	github.com/containerd/typeurl/v2 v2.2.2 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.4 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
@@ -98,7 +100,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cadvisor v0.51.0 // indirect
+	github.com/google/cadvisor v0.52.1 // indirect
 	github.com/google/cel-go v0.22.0 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -123,28 +125,24 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/moby/sys/mountinfo v0.7.2 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/mrunalp/fileutils v0.5.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/opencontainers/cgroups v0.0.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/runc v1.2.1 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/opencontainers/runc v1.2.5 // indirect
 	github.com/opencontainers/runtime-spec v1.2.0 // indirect
 	github.com/opencontainers/selinux v1.11.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/robfig/cron v1.2.0 // indirect
-	github.com/seccomp/libseccomp-golang v0.10.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
-	github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa // indirect
-	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.17 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
@@ -236,7 +234,3 @@ replace (
 	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.3
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.3
 )
-
-// Technical debt of NTO and its dependencies.
-// openshift/openshift-kni/debug-tools@v0.2.1 needs pinning of cadvisor; also gather-sysinfo.go needs to be fixed to allow usage of latest debug-tools
-replace github.com/google/cadvisor => github.com/google/cadvisor v0.49.1