This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a change to branch apisix-v2.14
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
discard 467ae983 chore: update certs (#1185)
omit dee1d2ac chore: update APISIX v2.14.1
add a649751d feat: ApisixUpstream v2 (#1141)
add 73498bd7 docs: update crd version (#1134)
add 6cf8bb7c feat: Add annotations to combine ApisixPluginConfig with k8s
ingress resource (#1139)
add 35ca03cb test: add e2e tests and CRDs for ApisixUpstream v2 (#1147)
add e75f7e9b chore: change description and labels for this project (#1150)
add f198f33c chore(deps): some dependency updates (#1160)
add edb19cdf chore(deps): bump github.com/gorilla/websocket in /test/e2e
(#1114)
add 9a6bd925 chore(deps): bump github.com/gruntwork-io/terratest in
/test/e2e (#1156)
add 628abb94 ci: upgrade e2e-test-ci (#1149)
add 3299260a chore(deps): bump k8s.io/client-go and go-memdb etc. (#1172)
add 1a5f2c16 chore(deps): bump github.com/spf13/cobra from 1.2.1 to 1.5.0
(#1176)
add 8c2cfbc2 chore(deps): bump github.com/stretchr/testify from 1.7.0 to
1.8.0 (#1175)
add b1add53c Chore dep update (#1180)
add 1765ec9f test: keep namespace when test failed in dev mod (#1158)
add a0bc7399 fix: trigger ApisixRoute event when service is created (#1152)
add 5525a3c2 chore: update APISIX v2.14.1
add ffe3af8a chore: update certs (#1185)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (467ae983)
\
N -- N -- N refs/heads/apisix-v2.14 (ffe3af8a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 13 +-
.github/actions/e2e/action.yaml | 69 ---
.github/dependabot.yml | 2 +-
.github/workflows/e2e-test-ci.yml | 100 +++-
Makefile | 125 +++--
cmd/ingress/ingress.go | 7 +-
conf/config-default.yaml | 1 +
docs/en/latest/concepts/annotations.md | 53 +++
docs/en/latest/concepts/apisix_cluster_config.md | 4 +-
docs/en/latest/concepts/apisix_route.md | 42 +-
docs/en/latest/concepts/apisix_tls.md | 2 +-
docs/en/latest/concepts/apisix_upstream.md | 12 +-
docs/en/latest/tutorials/mtls/mtls.yaml | 2 +-
docs/en/latest/tutorials/mtls/tls.yaml | 2 +-
docs/en/latest/tutorials/proxy-grpc-service.md | 4 +-
.../latest/tutorials/proxy-the-httpbin-service.md | 2 +-
docs/en/latest/upgrade.md | 4 +-
go.mod | 84 ++--
go.sum | 187 +++++---
pkg/config/config.go | 57 ++-
pkg/config/config_test.go | 39 +-
pkg/ingress/apisix_route.go | 227 +++++++++-
pkg/ingress/apisix_upstream.go | 301 ++++++++----
pkg/ingress/compare.go | 43 +-
pkg/ingress/controller.go | 154 ++++---
pkg/ingress/endpointslice.go | 2 +-
.../gateway/translation/gateway_httproute_test.go | 11 +-
pkg/ingress/secret.go | 2 +-
pkg/ingress/status.go | 18 +
pkg/ingress/utils/string.go | 15 +
.../apisix/client/clientset/versioned/clientset.go | 44 +-
.../versioned/typed/config/v2/config_client.go | 20 +-
.../config/v2/fake/fake_apisixclusterconfig.go | 2 +-
.../typed/config/v2/fake/fake_apisixconsumer.go | 2 +-
.../config/v2/fake/fake_apisixpluginconfig.go | 2 +-
.../typed/config/v2/fake/fake_apisixroute.go | 2 +-
.../typed/config/v2/fake/fake_apisixtls.go | 2 +-
.../typed/config/v2/fake/fake_apisixupstream.go | 2 +-
.../typed/config/v2beta2/config_client.go | 20 +-
.../typed/config/v2beta2/fake/fake_apisixroute.go | 2 +-
.../typed/config/v2beta3/config_client.go | 20 +-
.../v2beta3/fake/fake_apisixclusterconfig.go | 2 +-
.../config/v2beta3/fake/fake_apisixconsumer.go | 2 +-
.../config/v2beta3/fake/fake_apisixpluginconfig.go | 2 +-
.../typed/config/v2beta3/fake/fake_apisixroute.go | 2 +-
.../typed/config/v2beta3/fake/fake_apisixtls.go | 2 +-
.../config/v2beta3/fake/fake_apisixupstream.go | 2 +-
pkg/kube/apisix_route.go | 12 +
pkg/kube/apisix_upstream.go | 167 +++++++
pkg/kube/endpoint.go | 26 +-
pkg/kube/translation/apisix_route_test.go | 19 +-
pkg/kube/translation/apisix_upstream.go | 317 ++++++++++++-
pkg/kube/translation/apisix_upstream_test.go | 440 ++++++++++++++++--
pkg/kube/translation/ingress.go | 63 +--
pkg/kube/translation/ingress_test.go | 503 ++++++++++++---------
pkg/kube/translation/plugin_test.go | 19 +-
pkg/kube/translation/translator.go | 145 +++++-
pkg/kube/translation/translator_test.go | 79 +++-
samples/deploy/crd/v1/ApisixUpstream.yaml | 372 +++++++++++++++
test/e2e/README.md | 4 +-
test/e2e/e2e.go | 4 +-
test/e2e/go.mod | 66 +--
test/e2e/go.sum | 365 ++++-----------
test/e2e/scaffold/cluster_config.go | 4 +-
test/e2e/scaffold/consumer.go | 8 +-
test/e2e/scaffold/etcd.go | 2 +-
test/e2e/scaffold/httpbin.go | 2 +-
test/e2e/scaffold/ingress.go | 12 +-
test/e2e/scaffold/k8s.go | 2 +-
test/e2e/scaffold/scaffold.go | 147 +++---
test/e2e/scaffold/ssl.go | 6 +-
test/e2e/suite-annotations/plugin_conifg.go | 165 +++++++
test/e2e/suite-annotations/websocket.go | 36 +-
test/e2e/{suite-chaos => suite-chore}/chaos.go | 15 +-
test/e2e/{suite-config => suite-chore}/config.go | 39 +-
.../{suite-endpoints => suite-chore}/endpoints.go | 94 ++--
test/e2e/suite-config/manifests.go | 39 --
test/e2e/suite-features/healthcheck.go | 6 +-
test/e2e/suite-features/retries.go | 8 +-
test/e2e/suite-features/scheme.go | 4 +-
test/e2e/suite-features/subset.go | 4 +-
test/e2e/suite-features/websocket.go | 2 +-
.../suite-ingress-features/resourcesync.go | 2 +
.../suite-ingress/suite-ingress-features/status.go | 1 -
.../suite-ingress-resource/resourcepushing.go | 130 +++++-
.../suite-plugins/suite-plugins-general/echo.go | 6 +-
.../suite-plugins-general/redirect.go | 6 +-
.../suite-plugins-other/plugin_config.go | 38 +-
.../suite-plugins/suite-plugins-security/cors.go | 12 +-
.../suite-plugins-security/ip-restriction.go | 7 +-
.../suite-plugins-security/uri_blocker.go | 6 +-
.../suite-plugins-traffic/limit_count.go | 6 +-
.../suite-plugins-traffic/request_id.go | 6 +-
.../fault_injection.go | 6 +-
utils/kind-with-registry.sh | 1 -
95 files changed, 3619 insertions(+), 1518 deletions(-)
delete mode 100644 .github/actions/e2e/action.yaml
create mode 100644 pkg/kube/apisix_upstream.go
create mode 100644 test/e2e/suite-annotations/plugin_conifg.go
rename test/e2e/{suite-chaos => suite-chore}/chaos.go (84%)
rename test/e2e/{suite-config => suite-chore}/config.go (80%)
rename test/e2e/{suite-endpoints => suite-chore}/endpoints.go (65%)
delete mode 100644 test/e2e/suite-config/manifests.go
