Skip to content

Commit

Permalink
Update vendor for Block volume feature
Browse files Browse the repository at this point in the history
To update "github.com/kubernetes-incubator/external-storage" to use kubernetes-retired/external-storage#830,
just dep-ensure it doesn't work well with below error.

 # dep ensure -update "github.com/kubernetes-incubator/external-storage"
 # make container
   mkdir -p bin
   CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=v0.2.0-24-g6f650608-dirty -extldflags "-static"' -o ./bin/csi-provisioner ./cmd/csi-provisioner
   # github.com/kubernetes-csi/external-provisioner/vendor/github.com/kubernetes-incubator/external-storage/lib/controller
   vendor/github.com/kubernetes-incubator/external-storage/lib/controller/controller.go:455:39: unknown field 'Limiter' in struct literal of type workqueue.BucketRateLimiter
   vendor/github.com/kubernetes-incubator/external-storage/lib/controller/controller.go:459:40: unknown field 'Limiter' in struct literal of type workqueue.BucketRateLimiter
   make: *** [Makefile:32: csi-provisioner] Error 2

Because kubernetes-incubator/external-storage was changed to access to Limiter in workqueue.BucketRateLimiter in (*1),
and it is introduced to client-go in (*2). So, client-go needs to be updated to the version after this commit.

(*1) Use rate limited work queues and up resync from 15s to 15m
  kubernetes-retired/external-storage@126c9ff

(*2) Switch from juju/ratelimit to golang.org/x/time/rate
  kubernetes/client-go@acc5249

So, Gopkg.toml is updated to make "k8s.io/client-go" use "v7.0.0" instead of "v6.0.0",
and also it is dep-ensure'd.

 # dep ensure -update "k8s.io/client-go"
  • Loading branch information
mkimuram committed Jul 10, 2018
1 parent 6f65060 commit 4d0d12e
Show file tree
Hide file tree
Showing 802 changed files with 4,307 additions and 16,767 deletions.
100 changes: 63 additions & 37 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

[[constraint]]
name = "k8s.io/client-go"
version = "v6.0.0"
version = "v7.0.0"

[[constraint]]
name = "k8s.io/api"
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/google/btree/.travis.yml

This file was deleted.

Loading

0 comments on commit 4d0d12e

Please sign in to comment.