This is an automated email from the ASF dual-hosted git repository.
alinsran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 5775f23a fix: list is missing index parameter (#2513)
5775f23a is described below
commit 5775f23a8385aa1d109f1b3e8e51d2727b26c172
Author: AlinsRan <alins...@apache.org>
AuthorDate: Tue Aug 19 14:19:17 2025 +0800
fix: list is missing index parameter (#2513)
---
.github/workflows/apisix-e2e-test.yml | 1 +
internal/controller/utils.go | 2 +-
test/e2e/crds/v2/consumer.go | 2 +-
test/e2e/crds/v2/globalrule.go | 2 +-
test/e2e/crds/v2/pluginconfig.go | 2 +-
test/e2e/crds/v2/route.go | 2 +-
test/e2e/crds/v2/status.go | 2 +-
test/e2e/crds/v2/tls.go | 13 +------------
test/e2e/scaffold/apisix_deployer.go | 6 +++++-
9 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/apisix-e2e-test.yml
b/.github/workflows/apisix-e2e-test.yml
index f1400798..cc39a970 100644
--- a/.github/workflows/apisix-e2e-test.yml
+++ b/.github/workflows/apisix-e2e-test.yml
@@ -114,5 +114,6 @@ jobs:
TEST_DIR: "./test/e2e/apisix/"
PROVIDER_TYPE: ${{ matrix.provider_type }}
TEST_LABEL: ${{ matrix.cases_subset }}
+ TEST_ENV: CI
run: |
make ginkgo-e2e-test
diff --git a/internal/controller/utils.go b/internal/controller/utils.go
index 0917cf81..5783747c 100644
--- a/internal/controller/utils.go
+++ b/internal/controller/utils.go
@@ -1192,7 +1192,7 @@ func ListMatchingRequests(
matchFunc func(obj client.Object) bool,
opts ...client.ListOption,
) []reconcile.Request {
- if err := c.List(ctx, listObj); err != nil {
+ if err := c.List(ctx, listObj, opts...); err != nil {
logger.Error(err, "failed to list resource")
return nil
}
diff --git a/test/e2e/crds/v2/consumer.go b/test/e2e/crds/v2/consumer.go
index 2936a74d..c5690625 100644
--- a/test/e2e/crds/v2/consumer.go
+++ b/test/e2e/crds/v2/consumer.go
@@ -49,7 +49,7 @@ var _ = Describe("Test ApisixConsumer",
Label("apisix.apache.org", "v2", "apisix
time.Sleep(5 * time.Second)
By("create IngressClass")
- err = s.CreateResourceFromString(s.GetIngressClassYaml())
+ err =
s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
time.Sleep(5 * time.Second)
})
diff --git a/test/e2e/crds/v2/globalrule.go b/test/e2e/crds/v2/globalrule.go
index fbe06684..cca32e5c 100644
--- a/test/e2e/crds/v2/globalrule.go
+++ b/test/e2e/crds/v2/globalrule.go
@@ -62,7 +62,7 @@ spec:
time.Sleep(5 * time.Second)
By("create IngressClass")
- err =
s.CreateResourceFromString(s.GetIngressClassYaml())
+ err =
s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
Expect(err).NotTo(HaveOccurred(), "creating
IngressClass")
time.Sleep(5 * time.Second)
diff --git a/test/e2e/crds/v2/pluginconfig.go b/test/e2e/crds/v2/pluginconfig.go
index ebb2d765..1232a568 100644
--- a/test/e2e/crds/v2/pluginconfig.go
+++ b/test/e2e/crds/v2/pluginconfig.go
@@ -48,7 +48,7 @@ var _ = Describe("Test ApisixPluginConfig",
Label("apisix.apache.org", "v2", "ap
time.Sleep(5 * time.Second)
By("create IngressClass")
- err =
s.CreateResourceFromString(s.GetIngressClassYaml())
+ err =
s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
Expect(err).NotTo(HaveOccurred(), "creating
IngressClass")
time.Sleep(5 * time.Second)
})
diff --git a/test/e2e/crds/v2/route.go b/test/e2e/crds/v2/route.go
index 7e4ebab8..5b33d37d 100644
--- a/test/e2e/crds/v2/route.go
+++ b/test/e2e/crds/v2/route.go
@@ -55,7 +55,7 @@ var _ = Describe("Test ApisixRoute",
Label("apisix.apache.org", "v2", "apisixrou
time.Sleep(5 * time.Second)
By("create IngressClass")
- err = s.CreateResourceFromString(s.GetIngressClassYaml())
+ err =
s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
time.Sleep(5 * time.Second)
})
diff --git a/test/e2e/crds/v2/status.go b/test/e2e/crds/v2/status.go
index 9866d030..4420c862 100644
--- a/test/e2e/crds/v2/status.go
+++ b/test/e2e/crds/v2/status.go
@@ -49,7 +49,7 @@ var _ = Describe("Test CRD Status",
Label("apisix.apache.org", "v2", "apisixrout
time.Sleep(5 * time.Second)
By("create IngressClass")
- err =
s.CreateResourceFromString(s.GetIngressClassYaml())
+ err =
s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
Expect(err).NotTo(HaveOccurred(), "creating
IngressClass")
time.Sleep(5 * time.Second)
})
diff --git a/test/e2e/crds/v2/tls.go b/test/e2e/crds/v2/tls.go
index d6eb4cf0..84be9e80 100644
--- a/test/e2e/crds/v2/tls.go
+++ b/test/e2e/crds/v2/tls.go
@@ -106,7 +106,7 @@ var _ = Describe("Test ApisixTls",
Label("apisix.apache.org", "v2", "apisixtls")
time.Sleep(5 * time.Second)
By("create IngressClass")
- err =
s.CreateResourceFromString(fmt.Sprintf(ingressClassYamlTls, s.Namespace(),
s.GetControllerName(), s.Namespace()))
+ err =
s.CreateResourceFromStringWithNamespace(fmt.Sprintf(ingressClassYamlTls,
s.Namespace(), s.GetControllerName(), s.Namespace()), "")
Expect(err).NotTo(HaveOccurred(), "creating
IngressClass")
time.Sleep(5 * time.Second)
@@ -115,17 +115,6 @@ var _ = Describe("Test ApisixTls",
Label("apisix.apache.org", "v2", "apisixtls")
applier.MustApplyAPIv2(types.NamespacedName{Namespace:
s.Namespace(), Name: "test-route-tls"}, &apisixRoute,
fmt.Sprintf(apisixRouteYamlTls, s.Namespace()))
})
- AfterEach(func() {
- By("delete GatewayProxy")
- gatewayProxy := fmt.Sprintf(gatewayProxyYamlTls,
s.Deployer.GetAdminEndpoint(), s.AdminKey())
- err :=
s.DeleteResourceFromStringWithNamespace(gatewayProxy, s.Namespace())
- Expect(err).ShouldNot(HaveOccurred(), "deleting
GatewayProxy")
-
- By("delete IngressClass")
- err =
s.DeleteResourceFromStringWithNamespace(fmt.Sprintf(ingressClassYamlTls,
s.Namespace(), s.GetControllerName(), s.Namespace()), "")
- Expect(err).ShouldNot(HaveOccurred(), "deleting
IngressClass")
- })
-
It("Basic ApisixTls test", func() {
const host = "api6.com"
diff --git a/test/e2e/scaffold/apisix_deployer.go
b/test/e2e/scaffold/apisix_deployer.go
index f83cd29d..bfc9baae 100644
--- a/test/e2e/scaffold/apisix_deployer.go
+++ b/test/e2e/scaffold/apisix_deployer.go
@@ -99,13 +99,17 @@ func (s *APISIXDeployer) BeforeEach() {
e := utils.ParallelExecutor{}
e.Add(func() {
+ defer GinkgoRecover()
s.DeployDataplane(DeployDataplaneOptions{})
s.DeployIngress()
adminTunnel, err := s.createAdminTunnel(s.dataplaneService)
Expect(err).NotTo(HaveOccurred())
s.adminTunnel = adminTunnel
})
- e.Add(s.DeployTestService)
+ e.Add(func() {
+ defer GinkgoRecover()
+ s.DeployTestService()
+ })
e.Wait()
}
