Revert "Enable v3 Client as the default on UTs"

pkg/storage/etcd/testing/utils.go

@@ -27,16 +27,12 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
 	"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
-	"k8s.io/kubernetes/pkg/storage/storagebackend"
 	"k8s.io/kubernetes/pkg/util/wait"
 
 	etcd "github.com/coreos/etcd/client"
-	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v2http"
-	"github.com/coreos/etcd/integration"
 	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/coreos/etcd/pkg/transport"
 	"github.com/coreos/etcd/pkg/types"
@@ -46,8 +42,6 @@ import (
 
 // EtcdTestServer encapsulates the datastructures needed to start local instance for testing
 type EtcdTestServer struct {
-	// The following are lumped etcd2 test server params
-	// TODO: Deprecate in a post 1.5 release
 	etcdserver.ServerConfig
 	PeerListeners, ClientListeners []net.Listener
 	Client                         etcd.Client
@@ -60,10 +54,6 @@ type EtcdTestServer struct {
 	raftHandler http.Handler
 	s           *etcdserver.EtcdServer
 	hss         []*httptest.Server
-
-	// The following are lumped etcd3 test server params
-	v3Cluster *integration.ClusterV3
-	v3Client  *clientv3.Client
 }
 
 // newLocalListener opens a port localhost using any port
@@ -229,34 +219,30 @@ func (m *EtcdTestServer) waitUntilUp() error {
 
 // Terminate will shutdown the running etcd server
 func (m *EtcdTestServer) Terminate(t *testing.T) {
-	if m.v3Cluster != nil {
-		m.v3Cluster.Terminate(t)
-	} else {
-		m.Client = nil
-		m.s.Stop()
-		// TODO: This is a pretty ugly hack to workaround races during closing
-		// in-memory etcd server in unit tests - see #18928 for more details.
-		// We should get rid of it as soon as we have a proper fix - etcd clients
-		// have overwritten transport counting opened connections (probably by
-		// overwriting Dial function) and termination function waiting for all
-		// connections to be closed and stopping accepting new ones.
-		time.Sleep(250 * time.Millisecond)
-		for _, hs := range m.hss {
-			hs.CloseClientConnections()
-			hs.Close()
-		}
-		if err := os.RemoveAll(m.ServerConfig.DataDir); err != nil {
+	m.Client = nil
+	m.s.Stop()
+	// TODO: This is a pretty ugly hack to workaround races during closing
+	// in-memory etcd server in unit tests - see #18928 for more details.
+	// We should get rid of it as soon as we have a proper fix - etcd clients
+	// have overwritten transport counting opened connections (probably by
+	// overwriting Dial function) and termination function waiting for all
+	// connections to be closed and stopping accepting new ones.
+	time.Sleep(250 * time.Millisecond)
+	for _, hs := range m.hss {
+		hs.CloseClientConnections()
+		hs.Close()
+	}
+	if err := os.RemoveAll(m.ServerConfig.DataDir); err != nil {
+		t.Fatal(err)
+	}
+	if len(m.CertificatesDir) > 0 {
+		if err := os.RemoveAll(m.CertificatesDir); err != nil {
 			t.Fatal(err)
 		}
-		if len(m.CertificatesDir) > 0 {
-			if err := os.RemoveAll(m.CertificatesDir); err != nil {
-				t.Fatal(err)
-			}
-		}
 	}
 }
 
-// NewEtcdTestClientServer DEPRECATED creates a new client and server for testing
+// NewEtcdTestClientServer creates a new client and server for testing
 func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer {
 	server := configureTestCluster(t, "foo", true)
 	err := server.launch(t)
@@ -283,7 +269,7 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer {
 	return server
 }
 
-// NewUnsecuredEtcdTestClientServer DEPRECATED creates a new client and server for testing
+// NewUnsecuredEtcdTestClientServer creates a new client and server for testing
 func NewUnsecuredEtcdTestClientServer(t *testing.T) *EtcdTestServer {
 	server := configureTestCluster(t, "foo", false)
 	err := server.launch(t)
@@ -308,18 +294,3 @@ func NewUnsecuredEtcdTestClientServer(t *testing.T) *EtcdTestServer {
 	}
 	return server
 }
-
-// NewEtcd3TestClientServer creates a new client and server for testing
-func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storagebackend.Config) {
-	server := &EtcdTestServer{
-		v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}),
-	}
-	server.v3Client = server.v3Cluster.RandClient()
-	config := &storagebackend.Config{
-		Type:                     "etcd3",
-		Prefix:                   etcdtest.PathPrefix(),
-		ServerList:               server.v3Client.Endpoints(),
-		DeserializationCacheSize: etcdtest.DeserializationCacheSize,
-	}
-	return server, config
-}

pkg/storage/storagebackend/factory/etcd3.go

@@ -36,11 +36,7 @@ func newETCD3Storage(c storagebackend.Config) (storage.Interface, error) {
 	if err != nil {
 		return nil, err
 	}
-	// NOTE: Client relies on nil tlsConfig
-	// for non-secure connections, update the implicit variable
-	if len(c.CertFile) == 0 && len(c.KeyFile) == 0 && len(c.CAFile) == 0 {
-		tlsConfig = nil
-	}
+
 	cfg := clientv3.Config{
 		Endpoints: c.ServerList,
 		TLS:       tlsConfig,