Skip to content

Commit

Permalink
Upgrade Kubernetes dependencies to 1.17 (#307)
Browse files Browse the repository at this point in the history
Details:

- Update Kubernetes dependencies to 1.17.5.
- Add script and Makefile target to update
  Kubernetes dependencies
- Adjust code to dependency refactorings.
  • Loading branch information
timoreimann committed Apr 29, 2020
1 parent 4c5ac3a commit 231876f
Show file tree
Hide file tree
Showing 381 changed files with 101,558 additions and 40,614 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## unreleased

* Upgrade Kubernetes dependencies to 1.17
[[GH-307]](https://github.com/digitalocean/csi-digitalocean/pull/307)
* Add initContainer to delete automount udev rule file
[[GH-305]](https://github.com/digitalocean/csi-digitalocean/pull/305)
* Handle per-node volume limit exceeding error during ControllerPublishVolume
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ifneq ($(VERSION),)
else
VERSION ?= $(shell cat VERSION)
endif
KUBERNETES_VERSION ?= 1.17.5
DOCKER_REPO ?= digitalocean/do-csi-plugin
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
Expand All @@ -45,6 +46,10 @@ all: check-unused test

publish: compile build push clean

.PHONY: update-k8s
update-k8s:
env KUBERNETES_VERSION=$(KUBERNETES_VERSION) scripts/update-k8s.sh

.PHONY: bump-version
bump-version:
@[ "${NEW_VERSION}" ] || ( echo "NEW_VERSION must be set (ex. make NEW_VERSION=v1.x.x bump-version)"; exit 1 )
Expand Down
5 changes: 3 additions & 2 deletions driver/node.go

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

56 changes: 28 additions & 28 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,46 @@ require (
github.com/kubernetes-csi/external-snapshotter v0.4.1
github.com/magiconair/properties v1.8.1
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
google.golang.org/grpc v1.25.1
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/api v0.17.5
k8s.io/apimachinery v0.17.5
k8s.io/client-go v0.17.5
k8s.io/kubernetes v1.16.2
k8s.io/utils v0.0.0-20191218082557-f07c713de883 // indirect
k8s.io/utils v0.0.0-20191218082557-f07c713de883
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20190805141119-fdd30b57c827
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190805143126-cdb999c96590
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190805142138-368b2058237c
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190805143448-a07e59fb081d
k8s.io/client-go => k8s.io/client-go v0.0.0-20190805141520-2fe0317bcee0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190805144409-8484242760e7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190805144246-c01ee70854a1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/component-base => k8s.io/component-base v0.0.0-20190805141645-3a5e5ac800ae
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190805144531-3985229e1802
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190805142416-fd821fbbb94e
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190805144128-269742da31dd
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190805143734-7f1675b90353
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190805144012-2a1ed1f3d8a4
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190602132728-7075c07e78bf
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190805143852-517ff267f8d1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190805144654-3d5bf3a310c1
k8s.io/metrics => k8s.io/metrics v0.0.0-20190805143318-16b07057415d
k8s.io/api => k8s.io/api v0.17.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.5
k8s.io/apimachinery => k8s.io/apimachinery v0.17.6-beta.0
k8s.io/apiserver => k8s.io/apiserver v0.17.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.5
k8s.io/client-go => k8s.io/client-go v0.17.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.5
k8s.io/code-generator => k8s.io/code-generator v0.17.6-beta.0
k8s.io/component-base => k8s.io/component-base v0.17.5
k8s.io/cri-api => k8s.io/cri-api v0.17.6-beta.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.5
k8s.io/kubectl => k8s.io/kubectl v0.17.5
k8s.io/kubelet => k8s.io/kubelet v0.17.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.5
k8s.io/metrics => k8s.io/metrics v0.17.5
k8s.io/node-api => k8s.io/node-api v0.0.0-20190805144819-9dd62e4d5327
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190805142637-3b65bc4bb24f
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190805143616-1485e5142db3
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190805142825-b16fad786282
)

go 1.14

replace github.com/kubernetes-csi/csi-test/v3 => github.com/digitalocean/csi-test/v3 v3.1.1-0.20200422215505-20e87c55f1f6

replace k8s.io/kubernetes => k8s.io/kubernetes v1.17.5
Loading

0 comments on commit 231876f

Please sign in to comment.