From ae9ca48a3f7b79d60d50baec81c207912d001264 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Thu, 30 Jun 2022 10:26:36 +0800 Subject: [PATCH] remove duplicate certificate configuration for proxy test The issue was introduced in the following commit, https://github.com/etcd-io/etcd/commit/093282f5eab8b5ba5613b48594aed8794a757c8a Signed-off-by: Benjamin Wang --- tests/framework/e2e/cluster_proxy.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/framework/e2e/cluster_proxy.go b/tests/framework/e2e/cluster_proxy.go index 26094eefc..2c4e603e1 100644 --- a/tests/framework/e2e/cluster_proxy.go +++ b/tests/framework/e2e/cluster_proxy.go @@ -238,7 +238,8 @@ func newProxyV3Proc(cfg *EtcdServerProcessConfig) *proxyV3Proc { default: tlsArgs = append(tlsArgs, cfg.TlsArgs[i]) } - + } + if len(cfg.TlsArgs) > 0 { // Configure certificates for connection proxy ---> server. // This certificate must NOT have CN set. tlsArgs = append(tlsArgs, @@ -247,6 +248,7 @@ func newProxyV3Proc(cfg *EtcdServerProcessConfig) *proxyV3Proc { "--cacert", path.Join(FixturesDir, "ca.crt"), "--client-crl-file", path.Join(FixturesDir, "revoke.crl")) } + return &proxyV3Proc{ proxyProc{ lg: cfg.lg,