Skip to content

Commit

Permalink
CON-9193 update-csi for k8s 1.27 (#486)
Browse files Browse the repository at this point in the history
  • Loading branch information
llDrLove authored May 2, 2023
1 parent 356dd4c commit 76367b6
Show file tree
Hide file tree
Showing 366 changed files with 11,180 additions and 7,528 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.26" "${BRANCH}-tests-1.25" "${BRANCH}-tests-1.24" "${BRANCH}-tests-1.23" "${BRANCH}-builder")
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.27" "${BRANCH}-tests-1.26" "${BRANCH}-tests-1.25" "${BRANCH}-tests-1.24" "${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}/
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kube-release: ['1.26', '1.25', '1.24', '1.23']
kube-release: ['1.27', '1.26', '1.25', '1.24']

steps:
- name: checkout
Expand Down
48 changes: 24 additions & 24 deletions 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.26.0
KUBERNETES_VERSION ?= 1.27.1
DOCKER_REPO ?= digitalocean/do-csi-plugin
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
Expand Down Expand Up @@ -130,14 +130,14 @@ 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.27 || true
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.27 || true
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 || true
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.26 || true
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 || true
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.25 || true
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 || true
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.24 || 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)tools || true
@docker pull $(CANONICAL_RUNNER_IMAGE):tools || true
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime || true
Expand All @@ -151,10 +151,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.27"
@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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 -f test/e2e/Dockerfile test/e2e

@echo "building target tests-1.26"
@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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 -f test/e2e/Dockerfile test/e2e
Expand All @@ -163,6 +173,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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
Expand All @@ -173,6 +185,8 @@ runner-build:
@docker build --target tests-1.24 \
--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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
Expand All @@ -181,32 +195,18 @@ runner-build:
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.24 \
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 -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.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.25 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.24 \
--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 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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.25 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.24 \
--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)tools \
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools -f test/e2e/Dockerfile test/e2e
Expand All @@ -215,14 +215,14 @@ 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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.25 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.24 \
--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)tools \
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
Expand All @@ -233,14 +233,14 @@ 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.27 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.25 \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.24 \
--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)tools \
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
Expand All @@ -251,10 +251,10 @@ 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.27
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.24
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.23
@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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ The following table describes the required DigitalOcean CSI driver version per s
| 1.24 | v4.3.0+ |
| 1.25 | v4.4.0+ |
| 1.26 | v4.5.0+ |
| 1.27 | v4.6.0+ |

---
**Note:**
Expand Down
106 changes: 54 additions & 52 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,109 +1,111 @@
module github.com/digitalocean/csi-digitalocean

go 1.19
go 1.20

require (
github.com/blang/semver v3.5.1+incompatible
github.com/container-storage-interface/spec v1.5.0
github.com/digitalocean/go-metadata v0.0.0-20180111002115-15bd36e5f6f7
github.com/digitalocean/godo v1.87.0
github.com/docker/docker v20.10.2+incompatible
github.com/golang/protobuf v1.5.2
github.com/container-storage-interface/spec v1.8.0
github.com/digitalocean/go-metadata v0.0.0-20220602160802-6f1b22e9ba8c
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/uuid v1.2.0
github.com/kubernetes-csi/csi-test/v4 v4.3.0
github.com/magiconair/properties v1.8.5
github.com/sirupsen/logrus v1.8.1
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.3.0
google.golang.org/grpc v1.49.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.7.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.7.0
google.golang.org/grpc v1.51.0
gotest.tools/v3 v3.4.0
k8s.io/apimachinery v0.26.0
k8s.io/mount-utils v0.23.7
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
k8s.io/apimachinery v0.27.1
k8s.io/mount-utils v0.27.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
)

require (
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/containerd/containerd v1.5.8 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/distribution v2.8.0+incompatible // indirect
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.3 // 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
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/onsi/gomega v1.23.0 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.27.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
golang.org/x/text v0.5.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.1 // 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
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
)

replace k8s.io/api => k8s.io/api v0.26.0
replace k8s.io/api => k8s.io/api v0.27.1

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.1

replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.1-rc.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.1

replace k8s.io/apiserver => k8s.io/apiserver v0.26.0
replace k8s.io/apiserver => k8s.io/apiserver v0.27.1

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.1

replace k8s.io/client-go => k8s.io/client-go v0.26.0
replace k8s.io/client-go => k8s.io/client-go v0.27.1

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.1

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.1

replace k8s.io/code-generator => k8s.io/code-generator v0.26.1-rc.0
replace k8s.io/code-generator => k8s.io/code-generator v0.27.1

replace k8s.io/component-base => k8s.io/component-base v0.26.0
replace k8s.io/component-base => k8s.io/component-base v0.27.1

replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.1

replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.1

replace k8s.io/cri-api => k8s.io/cri-api v0.26.1-rc.0
replace k8s.io/cri-api => k8s.io/cri-api v0.27.1

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.1

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.1

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.1

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.1

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.1

replace k8s.io/kubectl => k8s.io/kubectl v0.26.0
replace k8s.io/kubectl => k8s.io/kubectl v0.27.1

replace k8s.io/kubelet => k8s.io/kubelet v0.26.0
replace k8s.io/kubelet => k8s.io/kubelet v0.27.1

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.1

replace k8s.io/metrics => k8s.io/metrics v0.26.0
replace k8s.io/metrics => k8s.io/metrics v0.27.1

replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.1-rc.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.1

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.1

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.1

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.1

replace k8s.io/kms => k8s.io/kms v0.26.1-rc.0
replace k8s.io/kms => k8s.io/kms v0.27.1
Loading

0 comments on commit 76367b6

Please sign in to comment.