Make kind-e2e run on different k8s versions

Author: carreter

.github/workflows/e2e.yaml

@@ -52,6 +52,15 @@ jobs:
     name: kind-e2e
     runs-on: ubuntu-20.04
     timeout-minutes: 100
+    needs:
+    - build
+    env:
+      REGISTRY: gcr.io/k8s-staging-kas-network-proxy
+      KIND_IMAGE: kindest/node${{ matrix.k8s }}
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s: [ v1.27.11, v1.28.7, v1.29.2 ]
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -66,7 +75,7 @@ jobs:
         chmod +x ./kind
         sudo mv ./kind /usr/local/bin/kind
     - name: Run e2e tests
-      run: REGISTRY=github-workflow make test-e2e
+      run: make test-e2e
   e2e:
     name: e2e
     runs-on: ubuntu-20.04

Makefile

@@ -54,6 +54,8 @@ TAG ?= $(shell git rev-parse HEAD)
 DOCKER_CMD ?= docker
 DOCKER_CLI_EXPERIMENTAL ?= enabled
 PROXY_SERVER_IP ?= 127.0.0.1
+
+KIND_IMAGE ?= kindest/node
 ## --------------------------------------
 ## Testing
 ## --------------------------------------
@@ -82,7 +84,7 @@ test-integration: build
 
 .PHONY: test-e2e
 test-e2e: docker-build
-	go test -mod=vendor ./e2e -race -agent-image ${AGENT_FULL_IMAGE}-$(TARGETARCH):${TAG} -server-image ${SERVER_FULL_IMAGE}-$(TARGETARCH):${TAG}
+	go test -mod=vendor ./e2e -race -agent-image ${AGENT_FULL_IMAGE}-$(TARGETARCH):${TAG} -server-image ${SERVER_FULL_IMAGE}-$(TARGETARCH):${TAG} -kind-image ${KIND_IMAGE}
 
 ## --------------------------------------
 ## Binaries

e2e/main_test.go

@@ -24,6 +24,7 @@ var (
 	testenv     env.Environment
 	agentImage  = flag.String("agent-image", "", "The proxy agent's docker image.")
 	serverImage = flag.String("server-image", "", "The proxy server's docker image.")
+	kindImage   = flag.String("kind-image", "kindest/node", "Image to use for kind nodes.")
 )
 
 func TestMain(m *testing.M) {
@@ -39,7 +40,7 @@ func TestMain(m *testing.M) {
 
 	testenv = env.New()
 	kindClusterName := "kind-test"
-	kindCluster := kind.NewCluster(kindClusterName)
+	kindCluster := kind.NewCluster(kindClusterName).WithOpts(kind.WithImage(*kindImage))
 
 	testenv.Setup(
 		envfuncs.CreateCluster(kindCluster, kindClusterName),