You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by al...@apache.org on 2025/08/14 01:16:54 UTC

(apisix-ingress-controller) 01/01: Merge branch 'master' into refactor/provider2

This is an automated email from the ASF dual-hosted git repository.

alinsran pushed a commit to branch refactor/provider2
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git

commit 096b661060dfdeea8e4ecd128201e552900bd8cd
Merge: 2846b9b2 ce0c5f4c
Author: rongxin <ro...@api7.ai>
AuthorDate: Thu Aug 14 09:16:33 2025 +0800

    Merge branch 'master' into refactor/provider2

 .github/workflows/apisix-e2e-test.yml          |   6 +-
 Makefile                                       |   4 +-
 test/e2e/crds/v1alpha1/backendtrafficpolicy.go |  69 ++-
 test/e2e/crds/v1alpha1/consumer.go             |  99 +++--
 test/e2e/crds/v1alpha1/gatewayproxy.go         |  66 +--
 test/e2e/crds/v2/basic.go                      |   5 +-
 test/e2e/crds/v2/consumer.go                   |  40 +-
 test/e2e/crds/v2/globalrule.go                 |  67 +--
 test/e2e/crds/v2/pluginconfig.go               | 125 +++---
 test/e2e/crds/v2/route.go                      | 298 ++++++++-----
 test/e2e/crds/v2/status.go                     |  77 ++--
 test/e2e/crds/v2/tls.go                        |  35 +-
 test/e2e/framework/assertion.go                |   4 +-
 test/e2e/gatewayapi/controller.go              |  50 +--
 test/e2e/gatewayapi/gateway.go                 |  55 +--
 test/e2e/gatewayapi/gatewayclass.go            |  40 +-
 test/e2e/gatewayapi/gatewayproxy.go            |  53 ++-
 test/e2e/gatewayapi/httproute.go               | 571 +++++++++++++++----------
 test/e2e/ingress/ingress.go                    | 260 +++++------
 test/e2e/scaffold/apisix_deployer.go           |  14 +-
 test/e2e/scaffold/assertion.go                 |   4 +-
 test/e2e/scaffold/k8s.go                       |   2 +-
 test/e2e/scaffold/scaffold.go                  |  41 ++
 23 files changed, 1111 insertions(+), 874 deletions(-)