Update csi for k8s 1.29

.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.28" "${BRANCH}-tests-1.27" "${BRANCH}-tests-1.26" "${BRANCH}-tests-1.25" "${BRANCH}-builder")
+          images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.29" "${BRANCH}-tests-1.28" "${BRANCH}-tests-1.27" "${BRANCH}-tests-1.26" "${BRANCH}-tests-1.25" "${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

@@ -90,7 +90,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kube-release: ['1.28', '1.27', '1.26', '1.25']
+        kube-release: ['1.29', '1.28', '1.27', '1.26', '1.25']
 
     steps:
       - name: checkout

Makefile

@@ -29,7 +29,7 @@ ifneq ($(VERSION),)
 else
   VERSION ?= $(shell cat VERSION)
 endif
-KUBERNETES_VERSION ?= 1.28.0
+KUBERNETES_VERSION ?= 1.29.0
 DOCKER_REPO ?= digitalocean/do-csi-plugin
 CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
 RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
@@ -130,6 +130,8 @@ 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.29 || true
+	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.29 || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.28 || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 || true
@@ -151,10 +153,20 @@ 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.29"
+	@docker build --target tests-1.29 \
+		--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.29 \
+		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
+		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.29 -f test/e2e/Dockerfile test/e2e
+
 	@echo "building target tests-1.28"
 	@docker build --target tests-1.28 \
 		--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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 -f test/e2e/Dockerfile test/e2e
@@ -163,6 +175,8 @@ runner-build:
 	@docker build --target tests-1.27 \
 		--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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -173,6 +187,8 @@ runner-build:
 	@docker build --target tests-1.26 \
 		--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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -185,6 +201,8 @@ runner-build:
 	@docker build --target tests-1.25 \
 		--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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -199,6 +217,8 @@ runner-build:
 	@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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 	    --cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -215,6 +235,8 @@ 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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -233,6 +255,8 @@ 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.29 \
+        --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
         --cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
@@ -251,6 +275,7 @@ 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.29
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27
 	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26

README.md

@@ -112,6 +112,7 @@ The following table describes the required DigitalOcean CSI driver version per s
 | 1.26               | v4.5.0+                         |
 | 1.27               | v4.6.0+                         |
 | 1.28               | v4.7.0+                         |
+| 1.29               | v4.8.0+                         |
 
 ---
 **Note:**

go.mod

@@ -1,6 +1,8 @@
 module github.com/digitalocean/csi-digitalocean
 
-go 1.20
+go 1.21
+
+toolchain go1.21.0
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
@@ -9,20 +11,20 @@ require (
 	github.com/digitalocean/godo v1.99.0
 	github.com/docker/docker v20.10.24+incompatible
 	github.com/golang/protobuf v1.5.3
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.3.0
 	github.com/kubernetes-csi/csi-test/v4 v4.4.0
 	github.com/magiconair/properties v1.8.7
 	github.com/sirupsen/logrus v1.9.0
 	golang.org/x/oauth2 v0.8.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.10.0
+	golang.org/x/sys v0.13.0
 	google.golang.org/grpc v1.51.0
 	gotest.tools/v3 v3.4.0
 	k8s.io/apimachinery v0.27.1
-	k8s.io/klog/v2 v2.100.1
+	k8s.io/klog/v2 v2.110.1
 	k8s.io/mount-utils v0.27.1
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
 require (
@@ -31,7 +33,7 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -40,73 +42,73 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.27.4 // indirect
+	github.com/onsi/gomega v1.29.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	golang.org/x/net v0.13.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace k8s.io/api => k8s.io/api v0.28.0
+replace k8s.io/api => k8s.io/api v0.29.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.0
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.28.0
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.28.0
+replace k8s.io/apiserver => k8s.io/apiserver v0.29.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.0
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.28.0
+replace k8s.io/client-go => k8s.io/client-go v0.29.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.0
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.0
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.28.0
+replace k8s.io/code-generator => k8s.io/code-generator v0.29.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.28.0
+replace k8s.io/component-base => k8s.io/component-base v0.29.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.28.0
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.28.0
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.28.0
+replace k8s.io/cri-api => k8s.io/cri-api v0.29.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.0
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.0
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.0
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.0
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.0
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.28.0
+replace k8s.io/kubectl => k8s.io/kubectl v0.29.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.28.0
+replace k8s.io/kubelet => k8s.io/kubelet v0.29.0
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.0
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.28.0
+replace k8s.io/metrics => k8s.io/metrics v0.29.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.28.0
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.30.0-alpha.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.0
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.0
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
 
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.0
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
 
-replace k8s.io/kms => k8s.io/kms v0.28.0
+replace k8s.io/kms => k8s.io/kms v0.29.0
 
-replace k8s.io/endpointslice => k8s.io/endpointslice v0.28.0
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.29.0