e2e: drop "ca-file" flags

Signed-off-by: Gyuho Lee <[email protected]>
etcd-io · Mar 20, 2018 · fa5f768 · fa5f768
1 parent 4f1cf30
commit fa5f768
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/e2e/cluster_proxy_test.go b/e2e/cluster_proxy_test.go
@@ -250,12 +250,12 @@ func newProxyV3Proc(cfg *etcdServerProcessConfig) *proxyV3Proc {
 		case "--key-file":
 			tlsArgs = append(tlsArgs, "--key", cfg.tlsArgs[i+1], "--key-file", cfg.tlsArgs[i+1])
 			i++
-		case "--ca-file":
+		case "--trusted-ca-file":
 			tlsArgs = append(tlsArgs, "--cacert", cfg.tlsArgs[i+1], "--trusted-ca-file", cfg.tlsArgs[i+1])
 			i++
 		case "--auto-tls":
 			tlsArgs = append(tlsArgs, "--auto-tls", "--insecure-skip-tls-verify")
-		case "--peer-ca-file", "--peer-cert-file", "--peer-key-file":
+		case "--peer-trusted-ca-file", "--peer-cert-file", "--peer-key-file":
 			i++ // skip arg
 		case "--client-cert-auth", "--peer-auto-tls":
 		default:

diff --git a/e2e/cluster_test.go b/e2e/cluster_test.go
@@ -280,7 +280,7 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
 			tlsClientArgs := []string{
 				"--cert-file", certPath,
 				"--key-file", privateKeyPath,
-				"--ca-file", caPath,
+				"--trusted-ca-file", caPath,
 			}
 			args = append(args, tlsClientArgs...)
 
@@ -297,7 +297,7 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) {
 			tlsPeerArgs := []string{
 				"--peer-cert-file", certPath,
 				"--peer-key-file", privateKeyPath,
-				"--peer-ca-file", caPath,
+				"--peer-trusted-ca-file", caPath,
 			}
 			args = append(args, tlsPeerArgs...)
 		}