Bump go-bindata and use go module

kubernetes · Dec 14, 2020 · 32337c0 · 32337c0
1 parent 52ea87d
commit 32337c0
Show file tree

Hide file tree

Showing 81 changed files with 11,513 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -154,7 +154,7 @@ kops-gobindata: ${BINDATA_TARGETS}
 
 .PHONY: update-bindata
 update-bindata:
-	GO111MODULE=on go run github.com/go-bindata/go-bindata/go-bindata -o ${BINDATA_TARGETS} -pkg models -nometadata -nocompress -ignore="\\.DS_Store" -ignore="bindata\\.go" -ignore="vfs\\.go" -prefix upup/models upup/models/cloudup/...
+	GO111MODULE=on go run github.com/go-bindata/go-bindata/v3/go-bindata -o ${BINDATA_TARGETS} -pkg models -nometadata -nocompress -ignore="\\.DS_Store" -ignore="bindata\\.go" -ignore="vfs\\.go" -prefix upup/models upup/models/cloudup/...
 	cd "${KOPS_ROOT}/hack" && GO111MODULE=on go build -o "${KOPS_ROOT}/_output/bin/goimports" golang.org/x/tools/cmd/goimports
 	"${KOPS_ROOT}/_output/bin/goimports" -w -v ${BINDATA_TARGETS}
 	gofmt -w -s ${BINDATA_TARGETS}

diff --git a/go.mod b/go.mod
@@ -67,7 +67,7 @@ require (
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
 	github.com/fullsailor/pkcs7 v0.0.0-20180422025557-ae226422660e
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-bindata/go-bindata v3.1.2+incompatible
+	github.com/go-bindata/go-bindata/v3 v3.1.3
 	github.com/go-ini/ini v1.51.0
 	github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
 	github.com/gogo/protobuf v1.3.1

diff --git a/go.sum b/go.sum
@@ -271,9 +271,10 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
+github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg=
 github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
-github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=
-github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
+github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBODNM7EGrCI=
+github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -536,6 +537,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -887,6 +889,7 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=

diff --git a/tools.go b/tools.go
@@ -19,5 +19,5 @@ limitations under the License.
 package kops
 
 import (
-	_ "github.com/go-bindata/go-bindata/go-bindata"
+	_ "github.com/go-bindata/go-bindata/v3/go-bindata"
 )
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/vendor/github.com/go-bindata/go-bindata/v3/.drone.yml b/vendor/github.com/go-bindata/go-bindata/v3/.drone.yml
diff --git a/...thub.com/go-bindata/go-bindata/.gitignore → ...b.com/go-bindata/go-bindata/v3/.gitignore b/...thub.com/go-bindata/go-bindata/.gitignore → ...b.com/go-bindata/go-bindata/v3/.gitignore
diff --git a/...hub.com/go-bindata/go-bindata/BUILD.bazel → ....com/go-bindata/go-bindata/v3/BUILD.bazel b/...hub.com/go-bindata/go-bindata/BUILD.bazel → ....com/go-bindata/go-bindata/v3/BUILD.bazel
diff --git a/...com/go-bindata/go-bindata/CONTRIBUTING.md → .../go-bindata/go-bindata/v3/CONTRIBUTING.md b/...com/go-bindata/go-bindata/CONTRIBUTING.md → .../go-bindata/go-bindata/v3/CONTRIBUTING.md
diff --git a/.../github.com/go-bindata/go-bindata/LICENSE → ...thub.com/go-bindata/go-bindata/v3/LICENSE b/.../github.com/go-bindata/go-bindata/LICENSE → ...thub.com/go-bindata/go-bindata/v3/LICENSE
diff --git a/...github.com/go-bindata/go-bindata/Makefile → ...hub.com/go-bindata/go-bindata/v3/Makefile b/...github.com/go-bindata/go-bindata/Makefile → ...hub.com/go-bindata/go-bindata/v3/Makefile
diff --git a/...ithub.com/go-bindata/go-bindata/README.md → ...ub.com/go-bindata/go-bindata/v3/README.md b/...ithub.com/go-bindata/go-bindata/README.md → ...ub.com/go-bindata/go-bindata/v3/README.md
diff --git a/...hub.com/go-bindata/go-bindata/_config.yml → ....com/go-bindata/go-bindata/v3/_config.yml b/...hub.com/go-bindata/go-bindata/_config.yml → ....com/go-bindata/go-bindata/v3/_config.yml
diff --git a/...github.com/go-bindata/go-bindata/asset.go → ...hub.com/go-bindata/go-bindata/v3/asset.go b/...github.com/go-bindata/go-bindata/asset.go → ...hub.com/go-bindata/go-bindata/v3/asset.go
diff --git a/...b.com/go-bindata/go-bindata/bytewriter.go → ...om/go-bindata/go-bindata/v3/bytewriter.go b/...b.com/go-bindata/go-bindata/bytewriter.go → ...om/go-bindata/go-bindata/v3/bytewriter.go
diff --git a/...ithub.com/go-bindata/go-bindata/config.go → ...ub.com/go-bindata/go-bindata/v3/config.go b/...ithub.com/go-bindata/go-bindata/config.go → ...ub.com/go-bindata/go-bindata/v3/config.go
diff --git a/...thub.com/go-bindata/go-bindata/convert.go → ...b.com/go-bindata/go-bindata/v3/convert.go b/...thub.com/go-bindata/go-bindata/convert.go → ...b.com/go-bindata/go-bindata/v3/convert.go
diff --git a/...github.com/go-bindata/go-bindata/debug.go → ...hub.com/go-bindata/go-bindata/v3/debug.go b/...github.com/go-bindata/go-bindata/debug.go → ...hub.com/go-bindata/go-bindata/v3/debug.go
diff --git a/...r/github.com/go-bindata/go-bindata/doc.go → ...ithub.com/go-bindata/go-bindata/v3/doc.go b/...r/github.com/go-bindata/go-bindata/doc.go → ...ithub.com/go-bindata/go-bindata/v3/doc.go
diff --git a/.../github.com/go-bindata/go-bindata/file.go → ...thub.com/go-bindata/go-bindata/v3/file.go b/.../github.com/go-bindata/go-bindata/file.go → ...thub.com/go-bindata/go-bindata/v3/file.go
diff --git a/...-bindata/go-bindata/go-bindata/.gitignore → ...ndata/go-bindata/v3/go-bindata/.gitignore b/...-bindata/go-bindata/go-bindata/.gitignore → ...ndata/go-bindata/v3/go-bindata/.gitignore
diff --git a/...go-bindata/go-bindata/AppendSliceValue.go → ...bindata/v3/go-bindata/AppendSliceValue.go b/...go-bindata/go-bindata/AppendSliceValue.go → ...bindata/v3/go-bindata/AppendSliceValue.go
diff --git a/...bindata/go-bindata/go-bindata/BUILD.bazel → ...data/go-bindata/v3/go-bindata/BUILD.bazel b/...bindata/go-bindata/go-bindata/BUILD.bazel → ...data/go-bindata/v3/go-bindata/BUILD.bazel
diff --git a/.../go-bindata/go-bindata/go-bindata/main.go → ...-bindata/go-bindata/v3/go-bindata/main.go b/.../go-bindata/go-bindata/go-bindata/main.go → ...-bindata/go-bindata/v3/go-bindata/main.go
diff --git a/...-bindata/go-bindata/go-bindata/version.go → ...ndata/go-bindata/v3/go-bindata/version.go b/...-bindata/go-bindata/go-bindata/version.go → ...ndata/go-bindata/v3/go-bindata/version.go
diff --git a/vendor/github.com/go-bindata/go-bindata/v3/go.mod b/vendor/github.com/go-bindata/go-bindata/v3/go.mod
diff --git a/vendor/github.com/go-bindata/go-bindata/v3/go.sum b/vendor/github.com/go-bindata/go-bindata/v3/go.sum
diff --git a/...thub.com/go-bindata/go-bindata/release.go → ...b.com/go-bindata/go-bindata/v3/release.go b/...thub.com/go-bindata/go-bindata/release.go → ...b.com/go-bindata/go-bindata/v3/release.go
diff --git a/...thub.com/go-bindata/go-bindata/restore.go → ...b.com/go-bindata/go-bindata/v3/restore.go b/...thub.com/go-bindata/go-bindata/restore.go → ...b.com/go-bindata/go-bindata/v3/restore.go
diff --git a/...com/go-bindata/go-bindata/stringwriter.go → .../go-bindata/go-bindata/v3/stringwriter.go b/...com/go-bindata/go-bindata/stringwriter.go → .../go-bindata/go-bindata/v3/stringwriter.go
diff --git a/...r/github.com/go-bindata/go-bindata/toc.go → ...ithub.com/go-bindata/go-bindata/v3/toc.go b/...r/github.com/go-bindata/go-bindata/toc.go → ...ithub.com/go-bindata/go-bindata/v3/toc.go
diff --git a/vendor/github.com/go-bindata/go-bindata/v3/tools.go b/vendor/github.com/go-bindata/go-bindata/v3/tools.go
diff --git a/vendor/github.com/kisielk/errcheck/.travis.yml b/vendor/github.com/kisielk/errcheck/.travis.yml