Skip to content

Commit 7759d04

Browse files
d-honeybadgerd-honeybadger
committed
e2e drop support for k8s 1.27
1 parent 0ed979b commit 7759d04

File tree

9 files changed

+4
-173
lines changed

9 files changed

+4
-173
lines changed

‎.github/workflows/delete.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
run: |
1616
BRANCH=$(echo -n ${BRANCH} | tr -c '[:alnum:]._-' '-')
1717
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)
18-
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.31" "${BRANCH}-tests-1.30" "${BRANCH}-tests-1.29" "${BRANCH}-tests-1.28" "${BRANCH}-tests-1.27" "${BRANCH}-builder")
18+
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.31" "${BRANCH}-tests-1.30" "${BRANCH}-tests-1.29" "${BRANCH}-tests-1.28" "${BRANCH}-builder")
1919
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
2020
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
strategy:
9494
fail-fast: false
9595
matrix:
96-
kube-release: ['1.31', '1.30', '1.29', '1.28', '1.27']
96+
kube-release: ['1.31', '1.30', '1.29', '1.28']
9797

9898
steps:
9999
- name: checkout

‎Makefile

-25
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ runner-build:
138138
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.29 || true
139139
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 || true
140140
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.28 || true
141-
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 || true
142-
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.27 || true
143141
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools || true
144142
@docker pull $(CANONICAL_RUNNER_IMAGE):tools || true
145143
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime || true
@@ -197,22 +195,6 @@ runner-build:
197195
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
198196
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 -f test/e2e/Dockerfile test/e2e
199197

200-
@echo "building target tests-1.27"
201-
@docker build --target tests-1.27 \
202-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
203-
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
204-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 \
205-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
206-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 \
207-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.30 \
208-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.29 \
209-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
210-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
211-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
212-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
213-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
214-
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 -f test/e2e/Dockerfile test/e2e
215-
216198
@echo "building target tools"
217199
@docker build --target tools \
218200
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
@@ -225,8 +207,6 @@ runner-build:
225207
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
226208
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
227209
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
228-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
229-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
230210
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
231211
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
232212
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools -f test/e2e/Dockerfile test/e2e
@@ -243,8 +223,6 @@ runner-build:
243223
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
244224
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
245225
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
246-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
247-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
248226
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
249227
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
250228
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -263,8 +241,6 @@ runner-build:
263241
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.29 \
264242
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28 \
265243
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.28 \
266-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27 \
267-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.27 \
268244
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
269245
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
270246
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -279,7 +255,6 @@ runner-push: runner-build
279255
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30
280256
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.29
281257
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.28
282-
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.27
283258
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools
284259
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime
285260
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)latest

‎test/e2e/Dockerfile

-12
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ RUN echo "${KUBE_VERSION_1_28_E2E_BIN_SHA256_CHECKSUM}" e2e.test | sha256sum --c
6060
RUN cp e2e.test /e2e.1.28.test
6161
RUN cp ginkgo /ginkgo-1.28
6262

63-
### Kubernetes 1.27
64-
FROM builder AS tests-1.27
65-
ARG KUBE_VERSION_1_27=1.27.1
66-
ARG KUBE_VERSION_1_27_E2E_BIN_SHA256_CHECKSUM=2728572bd1b650efb09f5383c59b25d0458b79ebe813678f34898eb3f50d71bf
67-
68-
RUN curl --fail --location https://dl.k8s.io/v${KUBE_VERSION_1_27}/kubernetes-test-linux-amd64.tar.gz | tar xvzf - --strip-components 3 kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo
69-
RUN echo "${KUBE_VERSION_1_27_E2E_BIN_SHA256_CHECKSUM}" e2e.test | sha256sum --check
70-
RUN cp e2e.test /e2e.1.27.test
71-
RUN cp ginkgo /ginkgo-1.27
72-
7363
FROM golang:1.21 AS tools
7464
# See comment at the bottom on why we need tini.
7565
ARG TINI_VERSION=0.19.0
@@ -100,8 +90,6 @@ COPY --from=tests-1.29 /e2e.1.29.test /
10090
COPY --from=tests-1.29 /ginkgo-1.29 /usr/local/bin
10191
COPY --from=tests-1.28 /e2e.1.28.test /
10292
COPY --from=tests-1.28 /ginkgo-1.28 /usr/local/bin
103-
COPY --from=tests-1.27 /e2e.1.27.test /
104-
COPY --from=tests-1.27 /ginkgo-1.27 /usr/local/bin
10593
COPY --from=tools /tini /sbin/
10694
COPY --from=tools /doctl /usr/local/bin/
10795
COPY --from=tools /kubectl /usr/local/bin/

‎test/e2e/e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var (
5454
errTokenMissing = errors.New("token must be specified in DIGITALOCEAN_ACCESS_TOKEN environment variable")
5555

5656
// De-facto global variables that require initialization at runtime.
57-
supportedKubernetesVersions = []string{"1.31", "1.30", "1.29", "1.28", "1.27"}
57+
supportedKubernetesVersions = []string{"1.31", "1.30", "1.29", "1.28"}
5858
sourceFileDir string
5959
testdriverDirectoryAbsolutePath string
6060
deployScriptPath string

‎test/e2e/handle-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ readonly OPERATION="$1"
3434

3535
case "${OPERATION}" in
3636
build)
37-
docker build -t "${IMAGE}" --build-arg KUBE_VERSION_1_31 --build-arg KUBE_VERSION_1_31_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_30 --build-arg KUBE_VERSION_1_30_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_29 --build-arg KUBE_VERSION_1_29_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_28 --build-arg KUBE_VERSION_1_28_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_27 --build-arg KUBE_VERSION_1_27_E2E_BIN_SHA256_CHECKSUM -f "${SCRIPT_DIR}/Dockerfile" "${SCRIPT_DIR}"
37+
docker build -t "${IMAGE}" --build-arg KUBE_VERSION_1_31 --build-arg KUBE_VERSION_1_31_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_30 --build-arg KUBE_VERSION_1_30_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_29 --build-arg KUBE_VERSION_1_29_E2E_BIN_SHA256_CHECKSUM --build-arg KUBE_VERSION_1_28 --build-arg KUBE_VERSION_1_28_E2E_BIN_SHA256_CHECKSUM -f "${SCRIPT_DIR}/Dockerfile" "${SCRIPT_DIR}"
3838
;;
3939

4040
push)

‎test/e2e/testdrivers/1.25.yaml

-44
This file was deleted.

‎test/e2e/testdrivers/1.26.yaml

-44
This file was deleted.

‎test/e2e/testdrivers/1.27.yaml

-44
This file was deleted.

0 commit comments

Comments
 (0)