Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify the golang dependencies #77

Merged
merged 1 commit into from
Jun 30, 2023
Merged

Simplify the golang dependencies #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/cpulist/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ import (

flag "github.com/spf13/pflag"

"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"

cpuset "github.com/openshift-kni/debug-tools/pkg/k8s_imported"
"github.com/openshift-kni/debug-tools/pkg/procs"
)

Expand Down
16 changes: 2 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,17 @@ require (
github.com/safchain/ethtool v0.2.0
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
google.golang.org/grpc v1.40.0
k8s.io/api v0.23.0
k8s.io/apimachinery v0.23.0
k8s.io/client-go v0.23.0
k8s.io/klog/v2 v2.30.0
k8s.io/kubelet v0.23.0
k8s.io/kubernetes v0.23.0
)

require (
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
Expand All @@ -42,18 +38,13 @@ require (
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jaypipes/pcidb v0.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-homedir v1.0.0 // indirect
github.com/moby/sys/mountinfo v0.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nxadm/tail v1.4.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
Expand All @@ -63,14 +54,11 @@ require (
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiserver v0.23.0 // indirect
k8s.io/component-base v0.23.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
Expand Down
260 changes: 1 addition & 259 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/pkg/numalign/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/openshift-kni/debug-tools/internal/pkg/vfs"

"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
cpuset "github.com/openshift-kni/debug-tools/pkg/k8s_imported"
)

func splitCPUList(cpuList string) ([]int, error) {
Expand Down
3 changes: 1 addition & 2 deletions pkg/irqs/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ import (
"strconv"
"strings"

"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"

"github.com/openshift-kni/debug-tools/pkg/fswrap"
cpuset "github.com/openshift-kni/debug-tools/pkg/k8s_imported"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/irqs/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"bytes"
"encoding/json"
"fmt"
cpuset "github.com/openshift-kni/debug-tools/pkg/k8s_imported"
"io/ioutil"
"log"
"os"
Expand All @@ -32,7 +33,6 @@ import (
"time"

"github.com/openshift-kni/debug-tools/pkg/irqs"
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
)

var nullLog = log.New(ioutil.Discard, "", 0)
Expand Down
2 changes: 1 addition & 1 deletion pkg/irqs/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"io"
"time"

"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
cpuset "github.com/openshift-kni/debug-tools/pkg/k8s_imported"
)

type Reporter interface {
Expand Down
Loading