CON-6258 Update CSI driver for Kubernetes 1.23

.github/workflows/delete.yaml

@@ -15,6 +15,6 @@ jobs:
         run: |
           BRANCH=$(echo -n ${BRANCH} | tr -c '[:alnum:]._-' '-')
           TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${DOCKER_USER}'", "password": "'${DOCKER_PASS}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
-          images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.22" "${BRANCH}-tests-1.21" "${BRANCH}-tests-1.20" "${BRANCH}-tests-1.19" "${BRANCH}-builder")
+          images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.23" "${BRANCH}-tests-1.22" "${BRANCH}-tests-1.21" "${BRANCH}-builder")
           for i in ${images[*]}; do curl --fail -sS -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/digitalocean/k8s-e2e-test-runner/tags/$i/; done
           curl --fail -sS -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/digitalocean/do-csi-plugin-dev/tags/${BRANCH}/

.github/workflows/test.yaml

@@ -89,7 +89,7 @@ jobs:
     needs: push-images
     strategy:
       matrix:
-        kube-release: ['1.22', '1.21', '1.20', '1.19']
+        kube-release: ['1.23', '1.22', '1.21']
 
     steps:
       - name: checkout

Makefile

@@ -28,7 +28,7 @@ ifneq ($(VERSION),)
 else
   VERSION ?= $(shell cat VERSION)
 endif
-KUBERNETES_VERSION ?= 1.19.2
+KUBERNETES_VERSION ?= 1.21.6
 DOCKER_REPO ?= digitalocean/do-csi-plugin
 CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
 RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
@@ -125,14 +125,12 @@ runner-build:
 	@echo "pulling cache images"
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):builder || true
+	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 || true
+	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.23 || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.22 || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.21 || true
-	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 || true
-	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.20 || true
-	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 || true
-	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.19 || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):tools || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime || true
@@ -146,10 +144,21 @@ runner-build:
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder -f test/e2e/Dockerfile test/e2e
 
+
+	@echo "building target tests-1.23"
+	@docker build --target tests-1.23 \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
+		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
+		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 -f test/e2e/Dockerfile test/e2e
+
 	@echo "building target tests-1.22"
 	@docker build --target tests-1.22 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 -f test/e2e/Dockerfile test/e2e
@@ -158,50 +167,24 @@ runner-build:
 	@docker build --target tests-1.21 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 -f test/e2e/Dockerfile test/e2e
 
-	@echo "building target tests-1.20"
-	@docker build --target tests-1.20 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.20 \
-		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 -f test/e2e/Dockerfile test/e2e
-
-	@echo "building target tests-1.19"
-	@docker build --target tests-1.19 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.20 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.19 \
-		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 -f test/e2e/Dockerfile test/e2e
-
 	@echo "building target tools"
 	@docker build --target tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.20 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.19 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools -f test/e2e/Dockerfile test/e2e
@@ -210,14 +193,12 @@ runner-build:
 	@docker build --target runtime \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.20 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.19 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -228,14 +209,12 @@ runner-build:
 	@docker build \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
+		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.23 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.22 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.21 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.20 \
-		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19 \
-		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.19 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -246,10 +225,9 @@ runner-build:
 
 runner-push: runner-build
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder
+	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.22
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.21
-	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.20
-	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.19
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)latest

cmd/do-csi-plugin/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.15
+FROM alpine:3.16
 
 # e2fsprogs-extra is required for resize2fs used for the resize operation
 # blkid: block device identification tool from util-linux

deploy/kubernetes/releases/csi-digitalocean-dev/driver.yaml

@@ -95,6 +95,8 @@ spec:
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"
+            - "--reconcile-sync=30m"
+            - "--timeout=2m"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -135,6 +137,7 @@ spec:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--token=$(DIGITALOCEAN_ACCESS_TOKEN)"
             - "--url=$(DIGITALOCEAN_API_URL)"
+            - "--default-volumes-page-size=200"
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock

go.mod

@@ -12,15 +12,15 @@ require (
 	github.com/google/go-cmp v0.5.5
 	github.com/google/uuid v1.2.0
 	github.com/kubernetes-csi/csi-test/v4 v4.3.0
-	github.com/magiconair/properties v1.8.1
+	github.com/magiconair/properties v1.8.5
 	github.com/sirupsen/logrus v1.8.1
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
-	google.golang.org/grpc v1.34.0
-	k8s.io/apimachinery v0.22.5
-	k8s.io/mount-utils v0.22.5
-	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
+	google.golang.org/grpc v1.40.0
+	k8s.io/apimachinery v0.23.7
+	k8s.io/mount-utils v0.23.7
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 )
 
 require (
@@ -30,10 +30,9 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/nxadm/tail v1.4.5 // indirect
 	github.com/onsi/ginkgo v1.14.2 // indirect
@@ -42,13 +41,62 @@ require (
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/appengine v1.6.5 // indirect
-	google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
 )
+
+replace k8s.io/api => k8s.io/api v0.23.7
+
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.7
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.9-rc.0
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.23.7
+
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.7
+
+replace k8s.io/client-go => k8s.io/client-go v0.23.7
+
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.7
+
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.7
+
+replace k8s.io/code-generator => k8s.io/code-generator v0.23.9-rc.0
+
+replace k8s.io/component-base => k8s.io/component-base v0.23.7
+
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.7
+
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.7
+
+replace k8s.io/cri-api => k8s.io/cri-api v0.23.9-rc.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.7
+
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.7
+
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.7
+
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.7
+
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.7
+
+replace k8s.io/kubectl => k8s.io/kubectl v0.23.7
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.23.7
+
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.7
+
+replace k8s.io/metrics => k8s.io/metrics v0.23.7
+
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.9-rc.0
+
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.7
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.7