Просмотр исходного кода

functional: disable TLS in release-3.2

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 лет назад
Родитель
Сommit
6efde070b8
2 измененных файлов с 17 добавлено и 17 удалено
  1. 16 16
      functional.yaml
  2. 1 1
      functional/rpcpb/member.go

+ 16 - 16
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

+ 1 - 1
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 {