fix: remove conf server #10012
fix: remove conf server #10012
Conversation
kingluo
force-pushed
the
remove-conf-server
branch
2 times, most recently
from
3f900b9
to
9ef8686
Compare
| utils.SetRoute(e, httpexpect.Status5xx) | ||
| utils.GetRoute(eDataPanel, http.StatusOK) | ||
| utils.TestPrometheusEtcdMetric(ePrometheus, 0) | ||
|
|
||
| bandwidthAfter, durationAfter = utils.GetEgressBandwidthPerSecond(ePrometheus) | ||
| bpsAfter = bandwidthAfter / durationAfter | ||
|
|
||
| errorLog, err := utils.Log(apisixPod, cliSet.KubeCli, timeStart) |
There was a problem hiding this comment.
Skip this test because it fails because it's a conf server specific test.
Note that we must keep this test even if we do not execute it, because it shares some data with the next test.
Error: 023/08/19 08:19:53 [error] 46#46: *9103 [lua] exporter.lua:456: handler(): prometheus: failed to reach config server while processing metrics endpoint: has no healthy etcd endpoint available
| @@ -91,12 +91,6 @@ if [ $count_test_access_log -eq 1 ]; then | |||
| exit 1 | |||
| fi | |||
|
|
|||
| count_access_log_off=`grep -c "access_log off;" conf/nginx.conf || true` | |||
There was a problem hiding this comment.
no access log for conf server anymore.
| @@ -19,57 +19,6 @@ | |||
|
|
|||
| . ./t/cli/common.sh | |||
|
|
|||
| echo ' | |||
There was a problem hiding this comment.
remove useless schema tests
| @@ -103,40 +45,6 @@ fi | |||
|
|
|||
| echo "passed: control_plane should enable Admin API" | |||
|
|
|||
| # use https | |||
There was a problem hiding this comment.
no https between cp and conf server anymore
| @@ -100,57 +100,6 @@ fi | |||
|
|
|||
| echo "passed: could connect to etcd" | |||
|
|
|||
| echo ' | |||
There was a problem hiding this comment.
only conf server requires all hosts to have the same scheme,
|
|
||
| # The 'admin.apisix.dev' is injected by ci/common.sh@set_coredns | ||
|
|
||
| # etcd mTLS verify |
There was a problem hiding this comment.
the mtls do not happen bewteen conf server and etcd anymore
| @@ -168,7 +168,7 @@ make run | |||
| sleep 1 | |||
| make stop | |||
|
|
|||
| if ! grep -E 'upstream SSL certificate does not match \"127.0.0.1\" while SSL handshaking to upstream' logs/error.log; then | |||
| if ! grep -F 'certificate host mismatch' logs/error.log; then | |||
There was a problem hiding this comment.
Now https happens between lua-resty-http and etcd, and the log changes.
| --- grep_error_log_out eval | ||
| qr/(peer closed connection in SSL handshake while SSL handshaking to upstream){1,}/ |
There was a problem hiding this comment.
Now https happens between lua-resty-http and etcd, and the log changes.
| @@ -118,42 +118,7 @@ qr/(closed){1,}/ | |||
|
|
|||
|
|
|||
|
|
|||
| === TEST 4: originate TLS connection to etcd cluster and verify TLS certificate (default behavior) | |||
There was a problem hiding this comment.
Now we should make a CA bundle into the https://github.com/openresty/lua-nginx-module#lua_ssl_trusted_certificate directive in "/" location, instead of the conf server one.
monkeyDluffy6017
dismissed stale reviews from leslie-tsang and themself
via
ea56b73
Description
https://lists.apache.org/thread/b69vjkbdszdtk9y30k45c2tvg4f3hqwt
Fixes #9381, Fixes #8067, Fixes #9212, Fixes #9049, Fixes #9582, Fixes #9578
Checklist