Skip to content
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

Update k8s deps to 1.25 #461

Merged
merged 10 commits into from
Nov 1, 2022
Merged

Update k8s deps to 1.25 #461

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1adb86c
update k8s deps to 1.25
varshavaradarajan Oct 14, 2022
612bc0e
add 1.25 e2e targets
varshavaradarajan Oct 14, 2022
28db1d8
update gh actions to include 1.25
varshavaradarajan Oct 14, 2022
ac53c13
update k8s compatibility matrix
varshavaradarajan Oct 14, 2022
2abcc8f
fix: run 1.25 e2e tests
mo-rieger Oct 25, 2022
0484f67
reference 1.25 cache in docker builds
mo-rieger Oct 25, 2022
a831ed1
Merge remote-tracking branch 'origin/master' into varsha/update-k8s-deps
mo-rieger Oct 25, 2022
7284449
go mod vendor
mo-rieger Oct 25, 2022
25fe871
copy e2e test binary for 1.25 into final test container
mo-rieger Oct 26, 2022
ea6fbe0
use ginkgo v2 for >=1.25 e2e tests
mo-rieger Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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.24" "${BRANCH}-tests-1.23" "${BRANCH}-tests-1.22" "${BRANCH}-builder")
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.25" "${BRANCH}-tests-1.24" "${BRANCH}-tests-1.23" "${BRANCH}-tests-1.22" "${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.24', '1.23', '1.22']
kube-release: ['1.25', '1.24', '1.23', '1.22']

steps:
- name: checkout
Expand Down
18 changes: 17 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.24.3
KUBERNETES_VERSION ?= 1.25.2
DOCKER_REPO ?= digitalocean/do-csi-plugin
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
Expand Down Expand Up @@ -125,6 +125,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.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
Expand All @@ -144,6 +146,13 @@ 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.25"
@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.25 \
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.25 \
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 -f test/e2e/Dockerfile test/e2e

@echo "building target tests-1.24"
varshavaradarajan marked this conversation as resolved.
Show resolved Hide resolved
@docker build --target tests-1.24 \
Expand Down Expand Up @@ -179,6 +188,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.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 \
Expand All @@ -193,6 +204,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.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 \
Expand All @@ -209,6 +222,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.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 \
Expand All @@ -225,6 +240,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.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)tests-1.22
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ The following table describes the required DigitalOcean CSI driver version per s
| 1.22 | v4 |
| 1.23 | v4.2.0+ |
| 1.24 | v4.3.0+ |
| 1.25 | v4.4.0+ |

---
**Note:**
Expand Down
81 changes: 41 additions & 40 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ require (
github.com/digitalocean/godo v1.29.0
github.com/docker/docker v20.10.2+incompatible
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.8
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-20211104180415-d3ed0bb246c8
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
google.golang.org/grpc v1.40.0
k8s.io/apimachinery v0.24.3
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
google.golang.org/grpc v1.47.0
k8s.io/apimachinery v0.25.2
k8s.io/mount-utils v0.23.7
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
)

require (
Expand All @@ -30,73 +30,74 @@ 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 v1.2.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.0.0 // indirect
github.com/moby/sys/mountinfo v0.6.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
github.com/onsi/gomega v1.10.4 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/onsi/gomega v1.20.1 // indirect
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-20220127200216-cd36cc0744dd // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // 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-20220107163113-42d7afdf6368 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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