Skip to content

Commit

Permalink
Merge pull request #341 from digitalocean/awg/1.19.1
Browse files Browse the repository at this point in the history
Update Kubernetes dependency to 1.19.1 and sidecars to latest
  • Loading branch information
adamwg authored Sep 24, 2020
2 parents 9ec7a7d + 407559d commit 15ecd75
Show file tree
Hide file tree
Showing 512 changed files with 74,496 additions and 115,727 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## unreleased

* Update Kubernetes dependency to 1.19.2 and sidecars to latest
[[GH-341]](https://github.com/digitalocean/csi-digitalocean/pull/341)

## v2.0.0 - 2020.06.22

* Add snapshot migration tool
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ifneq ($(VERSION),)
else
VERSION ?= $(shell cat VERSION)
endif
KUBERNETES_VERSION ?= 1.18.3
KUBERNETES_VERSION ?= 1.19.2
DOCKER_REPO ?= digitalocean/do-csi-plugin
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
Expand Down
18 changes: 13 additions & 5 deletions deploy/kubernetes/releases/csi-digitalocean-dev/driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
serviceAccount: csi-do-controller-sa
containers:
- name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v1.6.0
image: quay.io/k8scsi/csi-provisioner:v2.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=5"
Expand All @@ -88,7 +88,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher
image: quay.io/k8scsi/csi-attacher:v2.2.0
image: quay.io/k8scsi/csi-attacher:v3.0.0
args:
- "--csi-address=$(ADDRESS)"
- "--v=5"
Expand All @@ -112,11 +112,13 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-resizer
image: quay.io/k8scsi/csi-resizer:v0.5.0
image: quay.io/k8scsi/csi-resizer:v1.0.0
args:
- "--csi-address=$(ADDRESS)"
- "--csiTimeout=30s"
- "--timeout=30s"
- "--v=5"
# DO volumes support online resize.
- "--handle-volume-inuse-error=false"
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -183,6 +185,9 @@ rules:
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents"]
verbs: ["get", "list"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"]
verbs: ["get", "list", "watch"]

---

Expand Down Expand Up @@ -218,6 +223,9 @@ rules:
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]

---
kind: ClusterRoleBinding
Expand Down Expand Up @@ -346,7 +354,7 @@ spec:
mountPath: /etc/udev/rules.d/
containers:
- name: csi-node-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand Down
62 changes: 31 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,52 @@ require (
github.com/digitalocean/go-metadata v0.0.0-20180111002115-15bd36e5f6f7
github.com/digitalocean/godo v1.29.0
github.com/docker/docker v1.13.1
github.com/golang/protobuf v1.3.3
github.com/google/go-cmp v0.3.1
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.4.0
github.com/google/uuid v1.1.1
github.com/kubernetes-csi/csi-test/v4 v4.0.1
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1
github.com/magiconair/properties v1.8.1
github.com/sirupsen/logrus v1.4.2
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
github.com/sirupsen/logrus v1.6.0
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sys v0.0.0-20191220220014-0732a990476f
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
google.golang.org/grpc v1.29.1
k8s.io/api v0.18.3
k8s.io/apimachinery v0.18.3
k8s.io/client-go v0.18.3
k8s.io/api v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
k8s.io/kubernetes v1.16.2
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/yaml v1.2.0
)

replace (
k8s.io/api => k8s.io/api v0.18.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.3
k8s.io/apimachinery => k8s.io/apimachinery v0.18.3
k8s.io/apiserver => k8s.io/apiserver v0.18.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
k8s.io/client-go => k8s.io/client-go v0.18.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.3
k8s.io/code-generator => k8s.io/code-generator v0.18.3
k8s.io/component-base => k8s.io/component-base v0.18.3
k8s.io/cri-api => k8s.io/cri-api v0.18.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.3
k8s.io/kubectl => k8s.io/kubectl v0.18.3
k8s.io/kubelet => k8s.io/kubelet v0.18.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.3
k8s.io/metrics => k8s.io/metrics v0.18.3
k8s.io/api => k8s.io/api v0.19.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
k8s.io/apimachinery => k8s.io/apimachinery v0.19.3-rc.0
k8s.io/apiserver => k8s.io/apiserver v0.19.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.2
k8s.io/client-go => k8s.io/client-go v0.19.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.2
k8s.io/code-generator => k8s.io/code-generator v0.19.3-rc.0
k8s.io/component-base => k8s.io/component-base v0.19.2
k8s.io/cri-api => k8s.io/cri-api v0.19.3-rc.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.2
k8s.io/kubectl => k8s.io/kubectl v0.19.2
k8s.io/kubelet => k8s.io/kubelet v0.19.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.2
k8s.io/metrics => k8s.io/metrics v0.19.2
k8s.io/node-api => k8s.io/node-api v0.0.0-20190805144819-9dd62e4d5327
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.2
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.15

replace k8s.io/kubernetes => k8s.io/kubernetes v1.18.3
replace k8s.io/kubernetes => k8s.io/kubernetes v1.19.2
Loading

0 comments on commit 15ecd75

Please sign in to comment.