From 6efde070b830e636fdcf453b80c9fbd0c3fbbe89 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 12 Apr 2018 15:32:14 -0700 Subject: [PATCH] functional: disable TLS in release-3.2 Signed-off-by: Gyuho Lee --- functional.yaml | 32 ++++++++++++++++---------------- functional/rpcpb/member.go | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/functional.yaml b/functional.yaml index 24f6e50bc..bc275bc2e 100644 --- a/functional.yaml +++ b/functional.yaml @@ -13,21 +13,21 @@ agent-configs: wal-dir: /tmp/etcd-functional-1/etcd.data/member/wal heartbeat-interval: 100 election-timeout: 1000 - listen-client-urls: ["https://127.0.0.1:1379"] - advertise-client-urls: ["https://127.0.0.1:1379"] + listen-client-urls: ["http://127.0.0.1:1379"] + advertise-client-urls: ["http://127.0.0.1:1379"] auto-tls: true client-cert-auth: false cert-file: "" key-file: "" trusted-ca-file: "" - listen-peer-urls: ["https://127.0.0.1:1380"] - initial-advertise-peer-urls: ["https://127.0.0.1:13800"] + listen-peer-urls: ["http://127.0.0.1:1380"] + initial-advertise-peer-urls: ["http://127.0.0.1:13800"] peer-auto-tls: true peer-client-cert-auth: false peer-cert-file: "" peer-key-file: "" peer-trusted-ca-file: "" - initial-cluster: s1=https://127.0.0.1:13800,s2=https://127.0.0.1:23800,s3=https://127.0.0.1:33800 + initial-cluster: s1=http://127.0.0.1:13800,s2=http://127.0.0.1:23800,s3=http://127.0.0.1:33800 initial-cluster-state: new initial-cluster-token: tkn snapshot-count: 10000 @@ -62,21 +62,21 @@ agent-configs: wal-dir: /tmp/etcd-functional-2/etcd.data/member/wal heartbeat-interval: 100 election-timeout: 1000 - listen-client-urls: ["https://127.0.0.1:2379"] - advertise-client-urls: ["https://127.0.0.1:2379"] + listen-client-urls: ["http://127.0.0.1:2379"] + advertise-client-urls: ["http://127.0.0.1:2379"] auto-tls: true client-cert-auth: false cert-file: "" key-file: "" trusted-ca-file: "" - listen-peer-urls: ["https://127.0.0.1:2380"] - initial-advertise-peer-urls: ["https://127.0.0.1:23800"] + listen-peer-urls: ["http://127.0.0.1:2380"] + initial-advertise-peer-urls: ["http://127.0.0.1:23800"] peer-auto-tls: true peer-client-cert-auth: false peer-cert-file: "" peer-key-file: "" peer-trusted-ca-file: "" - initial-cluster: s1=https://127.0.0.1:13800,s2=https://127.0.0.1:23800,s3=https://127.0.0.1:33800 + initial-cluster: s1=http://127.0.0.1:13800,s2=http://127.0.0.1:23800,s3=http://127.0.0.1:33800 initial-cluster-state: new initial-cluster-token: tkn snapshot-count: 10000 @@ -111,21 +111,21 @@ agent-configs: wal-dir: /tmp/etcd-functional-3/etcd.data/member/wal heartbeat-interval: 100 election-timeout: 1000 - listen-client-urls: ["https://127.0.0.1:3379"] - advertise-client-urls: ["https://127.0.0.1:3379"] + listen-client-urls: ["http://127.0.0.1:3379"] + advertise-client-urls: ["http://127.0.0.1:3379"] auto-tls: true client-cert-auth: false cert-file: "" key-file: "" trusted-ca-file: "" - listen-peer-urls: ["https://127.0.0.1:3380"] - initial-advertise-peer-urls: ["https://127.0.0.1:33800"] + listen-peer-urls: ["http://127.0.0.1:3380"] + initial-advertise-peer-urls: ["http://127.0.0.1:33800"] peer-auto-tls: true peer-client-cert-auth: false peer-cert-file: "" peer-key-file: "" peer-trusted-ca-file: "" - initial-cluster: s1=https://127.0.0.1:13800,s2=https://127.0.0.1:23800,s3=https://127.0.0.1:33800 + initial-cluster: s1=http://127.0.0.1:13800,s2=http://127.0.0.1:23800,s3=http://127.0.0.1:33800 initial-cluster-state: new initial-cluster-token: tkn snapshot-count: 10000 @@ -163,7 +163,7 @@ tester-config: case-shuffle: true # For full descriptions, - # https://godoc.org/github.com/coreos/etcd/functional/rpcpb#Case + # http://godoc.org/github.com/coreos/etcd/functional/rpcpb#Case cases: - SIGTERM_ONE_FOLLOWER - SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 01f684113..b3760aab1 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -65,7 +65,7 @@ func (m *Member) DialEtcdGRPCServer(opts ...grpc.DialOption) (*grpc.ClientConn, // TODO: remove this with generated certs // only need it for auto TLS - InsecureSkipVerify: true, + // InsecureSkipVerify: true, } tlsConfig, err := tlsInfo.ClientConfig() if err != nil {