mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #14184 from ahrtr/fix_proxy_test_certificate_20220630
Remove duplicate certificate configuration for proxy test
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user