Skip to content

Commit

Permalink
Use k8s.io canonical import which dep enfores but go mod doesnt
Browse files Browse the repository at this point in the history
golang/go#26367 (comment)

That said, this does clean up the potential for the two different
versions of the same code imported in the same file to diverge.

Signed-off-by: Tyler Dixon <tylerd@uber.com>
  • Loading branch information
ZymoticB committed Mar 12, 2019
1 parent 2711fa9 commit 1eeef5a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ require (
github.com/jinzhu/now v0.0.0-20181116074157-8ec929ed50c3 // indirect
github.com/json-iterator/go v1.1.5 // indirect
github.com/jtolds/gls v4.2.1+incompatible // indirect
github.com/kubernetes/client-go v10.0.0+incompatible
github.com/lib/pq v1.0.0 // indirect
github.com/lyft/protoc-gen-validate v0.0.12 // indirect
github.com/mattn/go-sqlite3 v1.9.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswD
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kubernetes/client-go v10.0.0+incompatible h1:JyUQ2lK3g7vKdhEswzIYwJ7EkJ0J3A+uXbuRNAXhtbk=
github.com/kubernetes/client-go v10.0.0+incompatible/go.mod h1:kszVi2i+FeqECZHhjpkV5h5zM0GnURfJv897YzgoAQ8=
github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lyft/protoc-gen-validate v0.0.12 h1:4yfI8PSMdUqdTrQqjNIgjTJ7Vl3zFNqtgBGXsB7QJiw=
Expand Down
2 changes: 1 addition & 1 deletion pkg/common/plugin/k8s/client/client.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package client

import (
"github.com/kubernetes/client-go/kubernetes"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
Expand Down

0 comments on commit 1eeef5a

Please sign in to comment.