mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove duplicate certificate configuration for proxy test

Browse Source 
The issue was introduced in the following commit,
093282f5ea

Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
Benjamin Wang
2022-06-30 10:26:36 +08:00
parent 2a0e92fac0
commit ae9ca48a3f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/framework/e2e/cluster_proxy.go
View File

@ -238,7 +238,8 @@ func newProxyV3Proc(cfg *EtcdServerProcessConfig) *proxyV3Proc {
default: default:
tlsArgs = append(tlsArgs, cfg.TlsArgs[i]) tlsArgs = append(tlsArgs, cfg.TlsArgs[i])
} }
}
if len(cfg.TlsArgs) > 0 {
// Configure certificates for connection proxy ---> server. // Configure certificates for connection proxy ---> server.
// This certificate must NOT have CN set. // This certificate must NOT have CN set.
tlsArgs = append(tlsArgs, tlsArgs = append(tlsArgs,
@ -247,6 +248,7 @@ func newProxyV3Proc(cfg *EtcdServerProcessConfig) *proxyV3Proc {
"--cacert", path.Join(FixturesDir, "ca.crt"), "--cacert", path.Join(FixturesDir, "ca.crt"),
"--client-crl-file", path.Join(FixturesDir, "revoke.crl")) "--client-crl-file", path.Join(FixturesDir, "revoke.crl"))
} }
return &proxyV3Proc{ return &proxyV3Proc{
proxyProc{ proxyProc{
lg: cfg.lg, lg: cfg.lg,