From 523d6c7277c88d5ec307d1eb48a9e6267a9b9039 Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Sun, 2 Dec 2018 12:27:47 +0000 Subject: [PATCH] update for latest k8s libs --- connector/collector/kubernetes.go | 2 +- go.mod | 32 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/connector/collector/kubernetes.go b/connector/collector/kubernetes.go index af40472..7404ab4 100644 --- a/connector/collector/kubernetes.go +++ b/connector/collector/kubernetes.go @@ -4,7 +4,7 @@ import ( "time" "k8s.io/metrics/pkg/apis/metrics/v1alpha1" - "k8s.io/metrics/pkg/client/clientset_generated/clientset" + clientset "k8s.io/metrics/pkg/client/clientset/versioned" "github.com/bcicen/ctop/config" "github.com/bcicen/ctop/models" diff --git a/go.mod b/go.mod index 4921cba..1d36d0f 100644 --- a/go.mod +++ b/go.mod @@ -13,29 +13,49 @@ require ( github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 // indirect github.com/docker/go-units v0.3.2 // indirect github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 + github.com/ghodss/yaml v1.0.0 // indirect github.com/gizak/termui v2.3.0+incompatible github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 // indirect - github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect + github.com/gogo/protobuf v1.1.1 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect + github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect + github.com/googleapis/gnostic v0.2.0 // indirect + github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect + github.com/imdario/mergo v0.3.6 // indirect github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c - github.com/kr/pretty v0.1.0 // indirect - github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect - github.com/maruel/ut v1.0.0 // indirect + github.com/json-iterator/go v1.1.5 // indirect github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 github.com/opencontainers/runc v0.1.1 + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect + github.com/spf13/pflag v1.0.3 // indirect github.com/stretchr/testify v1.2.2 // indirect github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b // indirect github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc // indirect github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect - golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 // indirect + golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 // indirect + golang.org/x/oauth2 v0.0.0-20181128211412-28207608b838 // indirect golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect - golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 // indirect + golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect + google.golang.org/appengine v1.3.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.2.2 // indirect + k8s.io/api v0.0.0-20181130031204-d04500c8c3dd + k8s.io/apimachinery v0.0.0-20181201231028-18a5ff3097b4 + k8s.io/client-go v9.0.0+incompatible + k8s.io/klog v0.1.0 // indirect + k8s.io/metrics v0.0.0-20181121073115-d8618695b08f + sigs.k8s.io/yaml v1.1.0 // indirect ) replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5