f

Author: AlinsRan

.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

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"

test/e2e/crds/v2/tls.go

@@ -235,7 +235,11 @@ 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(10), *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.Equal(GinkgoT(), depth, *tls[0].Client.Depth, "client depth should be 1")
 		})
 		It("ApisixTls with skip_mtls_uri_regex test", func() {
 			// TODO: Add support for skip_mtls_uri_regex in API7EE control plane