chore: 1.18 kubernetes-ci use self-hosted

.github/workflows/apisix-conformance-test.yml

@@ -109,7 +109,6 @@ jobs:
       - name: Get Logs from apisix-ingress-controller
         shell: bash
         run: |
-          export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
           kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
 
       - name: Upload Gateway API Conformance Report

.github/workflows/conformance-test.yml

@@ -117,7 +117,6 @@ jobs:
       - name: Get Logs from api7-ingress-controller
         shell: bash
         run: |
-          export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
           kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
 
       - name: Upload Gateway API Conformance Report

.github/workflows/e2e-test-k8s.yml

@@ -34,35 +34,27 @@ jobs:
       matrix:
         cases_subset:
         - v2
-    runs-on: buildjet-2vcpu-ubuntu-2004
+    runs-on: self-hosted
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Setup Go Env
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.24"
+      - name: Check Go Env
+        run: |
+          go env
 
-      - name: Install kind
+      - name: Check Kind Version
         run: |
-          go install sigs.k8s.io/kind@v0.13.0
+          kind version
 
       - name: Install Helm
         run: |
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
 
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ secrets.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Login to Private Registry
         uses: docker/login-action@v3
         with:
@@ -72,9 +64,15 @@ jobs:
 
       - name: Launch Kind Cluster
         env:
-          KIND_NODE_IMAGE: kindest/node:v1.18.20@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed
+          KIND_NODE_IMAGE: kindest/node:v1.18.15
         run: |
           make kind-up
+          KIND_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' apisix-ingress-cluster-control-plane)
+          echo $KIND_NODE_IP
+
+          kubectl config get-clusters
+          kubectl config set-cluster kind-apisix-ingress-cluster --server=https://$KIND_NODE_IP:6443
+          kubectl wait --for=condition=Ready nodes --all
 
       - name: Build images
         env:
@@ -107,7 +105,6 @@ jobs:
           node $(pwd)/adc.js -v
           echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
 
-
       - name: Start OpenLDAP server
         run: make e2e-ldap
 

Makefile

@@ -48,8 +48,6 @@ CRD_DOCS_TEMPLATE ?= docs/assets/template
 
 INGRESS_VERSION ?= v1
 
-export KUBECONFIG = /tmp/$(KIND_NAME).kubeconfig
-
 # go
 VERSYM="github.com/apache/apisix-ingress-controller/internal/version._buildVersion"
 GITSHASYM="github.com/apache/apisix-ingress-controller/internal/version._buildGitRevision"
@@ -143,7 +141,6 @@ kind-e2e-test: kind-up build-image kind-load-images e2e-test
 # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
 .PHONY: e2e-test
 e2e-test: adc
-	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
 	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test $(TEST_DIR) -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)" -ginkgo.label-filter="$(TEST_LABEL)"
 
 .PHONY: download-api7ee3-chart
@@ -189,8 +186,6 @@ kind-up:
 	@kind get clusters 2>&1 | grep -v $(KIND_NAME) \
 		&& kind create cluster --name $(KIND_NAME) --image $(KIND_NODE_IMAGE) \
 		|| echo "kind cluster already exists"
-	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
-	kubectl wait --for=condition=Ready nodes --all
 
 .PHONY: kind-down
 kind-down:
@@ -277,7 +272,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
 docker-build: set-e2e-goos build ## Build docker image with the manager.
-	$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile .
+	$(CONTAINER_TOOL) build --build-arg TARGETARCH=${GOARCH} -t ${IMG} -f Dockerfile .
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.

test/e2e/crds/v2/route.go

@@ -1370,6 +1370,7 @@ spec:
   containers:
   - name: websocket-server
     image: jmalloc/echo-server:latest
+    imagePullPolicy: IfNotPresent
     ports:
     - containerPort: 8080
 ---
@@ -1430,6 +1431,7 @@ spec:
 			By("create WebSocket server resources")
 			err := s.CreateResourceFromStringWithNamespace(websocketServerResources, s.Namespace())
 			Expect(err).ShouldNot(HaveOccurred(), "creating WebSocket server resources")
+			s.EnsureNumEndpointsReady(GinkgoT(), "websocket-server-service", 1)
 
 			By("create ApisixRoute without WebSocker")
 			var apisixRouteWithoutWS apiv2.ApisixRoute
@@ -1438,7 +1440,6 @@ spec:
 				&apisixRouteWithoutWS,
 				fmt.Sprintf(apisixRouteSpec2, s.Namespace(), s.Namespace()),
 			)
-			time.Sleep(12 * time.Second)
 
 			By("verify WebSocket connection fails without WebSocket enabled")
 			u := url.URL{

test/e2e/crds/v2/tls.go

@@ -235,7 +235,12 @@ spec:
 			assert.NotNil(GinkgoT(), tls[0].Client, "client configuration should not be nil")
 			assert.NotEmpty(GinkgoT(), tls[0].Client.CA, "client CA should not be empty")
 			assert.Equal(GinkgoT(), normalizePEM(caCert), normalizePEM(tls[0].Client.CA), "client CA should be test-ca-secret")
-			assert.Equal(GinkgoT(), int64(1), *tls[0].Client.Depth, "client depth should be 1")
+			depth := int64(1)
+			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
+				depth = int64(10) // API7EE control plane currently defaults to depth 10 for mTLS
+			}
+			assert.NotNil(GinkgoT(), tls[0].Client.Depth, "client depth should be set")
+			assert.Equal(GinkgoT(), depth, *tls[0].Client.Depth, fmt.Sprintf("client depth should be %d", depth))
 		})
 		It("ApisixTls with skip_mtls_uri_regex test", func() {
 			// TODO: Add support for skip_mtls_uri_regex in API7EE control plane

test/e2e/framework/api7_dashboard.go

@@ -203,6 +203,8 @@ prometheus:
   server:
     persistence:
       enabled: false
+jaeger:
+  builtin: false
 postgresql:
 {{- if ne .DB "postgres" }}
   builtin: false