Skip to content

[CON-7035] Update CSI driver for Kubernetes 1.24 #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 24, 2022
Merged

[CON-7035] Update CSI driver for Kubernetes 1.24 #457

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b2614a
update k8s dependencies to support k8s 1.24.x
mo-rieger Aug 17, 2022
84ae0d5
test(e2e): add support for kubernetes 1.24
mo-rieger Aug 18, 2022
fd61e3b
add caching for 1.24 docker builds
mo-rieger Aug 19, 2022
81edcaf
explicitly disable currently unsupported capabilities in e2e tests
mo-rieger Aug 22, 2022
58a2812
update version file
mo-rieger Aug 23, 2022
5b5e43a
remove 1.21 e2e tests
mo-rieger Aug 23, 2022
24c8eb9
"Revert "Temporarily disable [Feature:VolumeSourceXFS] tests"""
mo-rieger Aug 23, 2022
d06a6ad
remove tests 1.21 for github workflows
mo-rieger Aug 23, 2022
2d961d8
Revert ""Revert "Temporarily disable [Feature:VolumeSourceXFS] tests""""
mo-rieger Aug 23, 2022
a5294f3
docs: add section on how to prepare csi driver for a new k8s minor ve…
mo-rieger Aug 24, 2022
6814dd6
docs: remove upstream release information
mo-rieger Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/delete.yaml
View file
Open in desktop
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.23" "${BRANCH}-tests-1.22" "${BRANCH}-tests-1.21" "${BRANCH}-builder")
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.24" "${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}/
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
needs: push-images
strategy:
matrix:
kube-release: ['1.23', '1.22', '1.21']
kube-release: ['1.24', '1.23', '1.22', '1.21']

steps:
- name: checkout
Expand Down
11 changes: 10 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ifneq ($(VERSION),)
else
VERSION ?= $(shell cat VERSION)
endif
KUBERNETES_VERSION ?= 1.21.6
KUBERNETES_VERSION ?= 1.24.3
DOCKER_REPO ?= digitalocean/do-csi-plugin
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
Expand Down Expand Up @@ -145,6 +145,14 @@ runner-build:
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder -f test/e2e/Dockerfile test/e2e


@echo "building target tests-1.24"
@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.24 \
--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 \
Expand Down Expand Up @@ -225,6 +233,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.24
@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
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ The following table describes the required DigitalOcean CSI driver version per s
| 1.21 | v3 |
| 1.22 | v4 |
| 1.23 | v4.2.0+ |
| 1.24 | v4.3.0+ |

---
**Note:**
Expand Down Expand Up @@ -367,6 +368,8 @@ make NEW_KUBERNETES_VERSION=X.Y.Z update-k8s

to update the Kubernetes dependencies to version X.Y.Z.

> Note: Make sure to also add support to the e2e tests for the new kubernetes version, following [these instructions](test/e2e/README.md#add-support-for-a-new-kubernetes-release).

## Releasing

Releases may happen either for the latest minor version of the CSI driver maintained in the `master` branch, or an older minor version still maintained in one of the `release-*` branches. In this section, we will call that branch the _release branch_.
Expand Down
62 changes: 31 additions & 31 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ require (
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-20210819190943-2bc19b11175f
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
google.golang.org/grpc v1.40.0
k8s.io/apimachinery v0.23.7
k8s.io/apimachinery v0.24.3
k8s.io/mount-utils v0.23.7
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
)
Expand All @@ -40,63 +40,63 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
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/net v0.0.0-20220127200216-cd36cc0744dd // 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.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // 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.30.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
)

replace k8s.io/api => k8s.io/api v0.23.7
replace k8s.io/api => k8s.io/api v0.24.3

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.7
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3

replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.9-rc.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.24.4-rc.0

replace k8s.io/apiserver => k8s.io/apiserver v0.23.7
replace k8s.io/apiserver => k8s.io/apiserver v0.24.3

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.7
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.3

replace k8s.io/client-go => k8s.io/client-go v0.23.7
replace k8s.io/client-go => k8s.io/client-go v0.24.3

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.7
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.3

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.7
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.3

replace k8s.io/code-generator => k8s.io/code-generator v0.23.9-rc.0
replace k8s.io/code-generator => k8s.io/code-generator v0.24.4-rc.0

replace k8s.io/component-base => k8s.io/component-base v0.23.7
replace k8s.io/component-base => k8s.io/component-base v0.24.3

replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.7
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.3

replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.7
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.3

replace k8s.io/cri-api => k8s.io/cri-api v0.23.9-rc.0
replace k8s.io/cri-api => k8s.io/cri-api v0.25.0-alpha.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.7
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.3

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.7
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.7
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.3

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.7
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.3

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.7
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.3

replace k8s.io/kubectl => k8s.io/kubectl v0.23.7
replace k8s.io/kubectl => k8s.io/kubectl v0.24.3

replace k8s.io/kubelet => k8s.io/kubelet v0.23.7
replace k8s.io/kubelet => k8s.io/kubelet v0.24.3

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.7
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.3

replace k8s.io/metrics => k8s.io/metrics v0.23.7
replace k8s.io/metrics => k8s.io/metrics v0.24.3

replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.9-rc.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.4-rc.0

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.7
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.3

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.7
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.3
Loading