Merge branch 'kperath/remove-1-25' into kperath/update-csi

digitalocean · Jan 9, 2024 · b84ba47 · b84ba47
2 parents e01f971 + 8c77eba
commit b84ba47
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 40 deletions.
diff --git a/.github/workflows/delete.yaml b/.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.29" "${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}-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}/
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -90,7 +90,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kube-release: ['1.29', '1.28', '1.27', '1.26', '1.25']
+        kube-release: ['1.29', '1.28', '1.27', '1.26']
 
     steps:
       - name: checkout

diff --git a/Makefile b/Makefile
@@ -138,8 +138,6 @@ runner-build:
 	@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)tools || true
 	@docker pull $(CANONICAL_RUNNER_IMAGE):tools || true
 	@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime || true
@@ -197,22 +195,6 @@ runner-build:
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.26 \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.26 -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.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 \
-        --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 \
-		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25 -f test/e2e/Dockerfile test/e2e
-
 	@echo "building target tools"
 	@docker build --target tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
@@ -225,8 +207,6 @@ runner-build:
         --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)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools -f test/e2e/Dockerfile test/e2e
@@ -243,8 +223,6 @@ runner-build:
         --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)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -263,8 +241,6 @@ runner-build:
         --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)tools \
 		--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
 		--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -279,7 +255,6 @@ runner-push: runner-build
 	@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
-	@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.25
 	@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

diff --git a/test/e2e/Dockerfile b/test/e2e/Dockerfile
@@ -60,16 +60,6 @@ RUN echo "${KUBE_VERSION_1_26_E2E_BIN_SHA256_CHECKSUM}" e2e.test | sha256sum --c
 RUN cp e2e.test /e2e.1.26.test
 RUN cp ginkgo /ginkgo-1.26
 
-### Kubernetes 1.25
-FROM builder AS tests-1.25
-ARG KUBE_VERSION_1_25=1.25.2
-ARG KUBE_VERSION_1_25_E2E_BIN_SHA256_CHECKSUM=b9ec7494abed4d5d40f4027e4211da0a2b33f76f81f6813430a9ebd142ca83a0
-
-RUN curl --fail --location https://dl.k8s.io/v${KUBE_VERSION_1_25}/kubernetes-test-linux-amd64.tar.gz | tar xvzf - --strip-components 3 kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo
-RUN echo "${KUBE_VERSION_1_25_E2E_BIN_SHA256_CHECKSUM}" e2e.test | sha256sum --check
-RUN cp e2e.test /e2e.1.25.test
-RUN cp ginkgo /ginkgo-1.25
-
 FROM golang:1.21 AS tools
 # See comment at the bottom on why we need tini.
 ARG TINI_VERSION=0.19.0
@@ -100,8 +90,6 @@ COPY --from=tests-1.27 /e2e.1.27.test /
 COPY --from=tests-1.27 /ginkgo-1.27 /usr/local/bin
 COPY --from=tests-1.26 /e2e.1.26.test /
 COPY --from=tests-1.26 /ginkgo-1.26 /usr/local/bin
-COPY --from=tests-1.25 /e2e.1.25.test /
-COPY --from=tests-1.25 /ginkgo-1.25 /usr/local/bin
 COPY --from=tools /tini /sbin/
 COPY --from=tools /doctl /usr/local/bin/
 COPY --from=tools /kubectl /usr/local/bin/

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -54,7 +54,7 @@ var (
 	errTokenMissing = errors.New("token must be specified in DIGITALOCEAN_ACCESS_TOKEN environment variable")
 
 	// De-facto global variables that require initialization at runtime.
-	supportedKubernetesVersions     = []string{"1.29", "1.28", "1.27", "1.26", "1.25"}
+	supportedKubernetesVersions     = []string{"1.29", "1.28", "1.27", "1.26"}
 	sourceFileDir                   string
 	testdriverDirectoryAbsolutePath string
 	deployScriptPath                string