Merge pull request #87226 from liggitt/simplify-code-generator

Simplify code generator dependencies

Kubernetes-commit: b95d571e32294047a5fb9ca93ee4e394f6765308
This commit is contained in:
Kubernetes Publisher 2020-01-15 09:41:47 -08:00
parent a23205f445
commit 2ddb023c08
3 changed files with 16 additions and 81 deletions

76
Godeps/Godeps.json generated
View File

@ -38,10 +38,6 @@
"ImportPath": "github.com/BurntSushi/toml",
"Rev": "v0.3.1"
},
{
"ImportPath": "github.com/BurntSushi/xgb",
"Rev": "27f122750802"
},
{
"ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "56545f4a5d46"
@ -54,10 +50,6 @@
"ImportPath": "github.com/PuerkitoBio/urlesc",
"Rev": "de5bf2ad4578"
},
{
"ImportPath": "github.com/ajstarks/svgo",
"Rev": "644b8db467af"
},
{
"ImportPath": "github.com/client9/misspell",
"Rev": "v0.3.4"
@ -86,10 +78,6 @@
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
},
{
"ImportPath": "github.com/fogleman/gg",
"Rev": "0403632d5b90"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
"Rev": "v1.4.7"
@ -122,10 +110,6 @@
"ImportPath": "github.com/gogo/protobuf",
"Rev": "65acae22fc9d"
},
{
"ImportPath": "github.com/golang/freetype",
"Rev": "e2365dfdc4a0"
},
{
"ImportPath": "github.com/golang/glog",
"Rev": "23def4e6c14b"
@ -202,10 +186,6 @@
"ImportPath": "github.com/jstemmer/go-junit-report",
"Rev": "af01ea7f8024"
},
{
"ImportPath": "github.com/jung-kurt/gofpdf",
"Rev": "24315acbbda5"
},
{
"ImportPath": "github.com/kisielk/errcheck",
"Rev": "v1.2.0"
@ -262,10 +242,6 @@
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/remyoudompheng/bigfft",
"Rev": "52369c62f446"
},
{
"ImportPath": "github.com/spf13/afero",
"Rev": "v1.2.2"
@ -292,20 +268,12 @@
},
{
"ImportPath": "golang.org/x/exp",
"Rev": "4b39c73a6495"
},
{
"ImportPath": "golang.org/x/image",
"Rev": "0694c2d4d067"
"Rev": "509febef88a4"
},
{
"ImportPath": "golang.org/x/lint",
"Rev": "5614ed5bae6f"
},
{
"ImportPath": "golang.org/x/mobile",
"Rev": "d3739f865fa6"
},
{
"ImportPath": "golang.org/x/net",
"Rev": "13f9640d40b9"
@ -338,18 +306,6 @@
"ImportPath": "golang.org/x/xerrors",
"Rev": "a985d3407aa7"
},
{
"ImportPath": "gonum.org/v1/gonum",
"Rev": "v0.6.2"
},
{
"ImportPath": "gonum.org/v1/netlib",
"Rev": "76723241ea4e"
},
{
"ImportPath": "gonum.org/v1/plot",
"Rev": "e2840ee46a6b"
},
{
"ImportPath": "google.golang.org/api",
"Rev": "v0.4.0"
@ -396,15 +352,15 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "44bd77c24ef9"
"Rev": "c76d55892ea2"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bcaa73156d59"
"Rev": "ded4aaa1cc04"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "0826954c61ed"
"Rev": "ff19ea5b1bbd"
},
{
"ImportPath": "k8s.io/gengo",
@ -422,30 +378,6 @@
"ImportPath": "k8s.io/utils",
"Rev": "9e5e9d854fcc"
},
{
"ImportPath": "modernc.org/cc",
"Rev": "v1.0.0"
},
{
"ImportPath": "modernc.org/golex",
"Rev": "v1.0.0"
},
{
"ImportPath": "modernc.org/mathutil",
"Rev": "v1.0.0"
},
{
"ImportPath": "modernc.org/strutil",
"Rev": "v1.0.0"
},
{
"ImportPath": "modernc.org/xc",
"Rev": "v1.0.0"
},
{
"ImportPath": "rsc.io/pdf",
"Rev": "v0.1.1"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",
"Rev": "15d366b2352e"

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200113233642-3946df5ca773
k8s.io/apimachinery v0.0.0-20200115193536-c76d55892ea2
k8s.io/client-go v0.0.0-20200115033918-ded4aaa1cc04
k8s.io/code-generator v0.0.0-20200115193335-ff19ea5b1bbd
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20200113233642-3946df5ca773
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200115193536-c76d55892ea2
k8s.io/client-go => k8s.io/client-go v0.0.0-20200115033918-ded4aaa1cc04
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200115193335-ff19ea5b1bbd
)

4
go.sum
View File

@ -210,6 +210,10 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200113233642-3946df5ca773/go.mod h1:MaLruEeTLKLn27taXorduyZtEwdemDrDZ4oYXJtgEKk=
k8s.io/apimachinery v0.0.0-20200115193536-c76d55892ea2/go.mod h1:/EWk7L6AbgunQY8jCyDMNfyezWsOmdG7F6v0E8blsm8=
k8s.io/client-go v0.0.0-20200115033918-ded4aaa1cc04/go.mod h1:RNk5vzm9IeU3SovM64S2JTFfWK3mO+WSZzD5pzvAzzs=
k8s.io/code-generator v0.0.0-20200115193335-ff19ea5b1bbd/go.mod h1:WPgBROsoLFrWctCL2GsTBR5dOmq5qKze3vy4ssGz+MM=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=