Skip to content

Commit

Permalink
vendor: Bump k8s.io/client-go to 9.0.0
Browse files Browse the repository at this point in the history
8.0.0 is the version that's compatible with Kubernetes 1.11 [1], and
we've been using Kubernetes 1.11.3 for apimachinery since 2a606ef
(vendor: bump apimachinery to 1.11.3, 2018-10-01, #382).  client-go
9.0.0 is nominally compatible with Kubernetes 1.12 [2], and I want
this for UntilWithoutRetry [3] which is new in 9.0.0 [4].

I edited Gopkg.toml by hand and regenerated everything else with:

  $ dep ensure

using:

  $ dep version
  dep:
   version     : v0.5.0
   build date  :
   git hash    : 22125cf
   go version  : go1.10.3
   go compiler : gc
   platform    : linux/amd64
   features    : ImportDuringSolve=false

I need to bump apimachinery into the 1.12 channel as well to avoid
(and now I match client-go's declared dependency [2]):

  $ dep ensure
  Solving failure: package k8s.io/apimachinery/pkg/util/naming does not exist within project k8s.io/apimachinery

naming is new in 1.12 [5] and we're pulling it with:

  $ git grep util/naming vendor
  vendor/k8s.io/apimachinery/pkg/runtime/scheme.go:				"k8s.io/apimachinery/pkg/util/naming"
  vendor/k8s.io/client-go/tools/cache/reflector.go:				"k8s.io/apimachinery/pkg/util/naming"
  $ git grep tools/cache vendor/k8s.io/client-go/tools/watch
  vendor/k8s.io/client-go/tools/watch/informerwatcher.go:	"k8s.io/client-go/tools/cache"
  vendor/k8s.io/client-go/tools/watch/until.go:						"k8s.io/client-go/tools/cache"

Then I needed to change client-go to an override to avoid:

  $ dep ensure
  Solving failure: package k8s.io/api/autoscaling/v2beta2 does not exist within project k8s.io/api

Besides the version bump, dep also pulled in libraries for waiting on
Kubernetes events.

[1]: kubernetes/client-go@7d04d0e
[2]: kubernetes/client-go@1638f89
[3]: https://github.com/kubernetes/client-go/blob/v9.0.0/tools/watch/until.go#L47-L58
[4]: kubernetes/client-go@cbdb98d
[5]: kubernetes/apimachinery@3c4948e
  • Loading branch information
wking committed Nov 2, 2018
1 parent 127219f commit d9ae9b3
Show file tree
Hide file tree
Showing 643 changed files with 196,451 additions and 766 deletions.
204 changes: 195 additions & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ ignored = ["github.com/openshift/installer/tests*"]

[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.11.3"
version = "kubernetes-1.12.2"

[[constraint]]
[[override]]
name = "k8s.io/client-go"
version = "6.0.0"
version = "9.0.0"

[[constraint]]
name = "sigs.k8s.io/cluster-api"
Expand Down
3 changes: 3 additions & 0 deletions vendor/github.com/golang/protobuf/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/golang/protobuf/CONTRIBUTORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions vendor/github.com/golang/protobuf/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d9ae9b3

Please sign in to comment.