Replace github.com/coreos/etcd by go.etcd.io/etcd

test/extended/etcd/etcd_storage_path.go

@@ -29,7 +29,7 @@ import (
 	kapihelper "k8s.io/kubernetes/pkg/apis/core/helper"
 	etcddata "k8s.io/kubernetes/test/integration/etcd"
 
-	etcdv3 "github.com/coreos/etcd/clientv3"
+	etcdv3 "go.etcd.io/etcd/clientv3"
 )
 
 // Etcd data for all persisted OpenShift objects.

test/extended/etcd/etcd_test_runner.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
+	"go.etcd.io/etcd/clientv3"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

tools/etcdhelper/etcdhelper.go

@@ -13,8 +13,8 @@ import (
 	jsonserializer "k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/kubectl/pkg/scheme"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/transport"
 
 	"github.com/openshift/api"
 )
@@ -53,9 +53,9 @@ func main() {
 	var tlsConfig *tls.Config
 	if len(certFile) != 0 || len(keyFile) != 0 || len(caFile) != 0 {
 		tlsInfo := transport.TLSInfo{
-			CertFile: certFile,
-			KeyFile:  keyFile,
-			CAFile:   caFile,
+			CertFile:      certFile,
+			KeyFile:       keyFile,
+			TrustedCAFile: caFile,
 		}
 		var err error
 		tlsConfig, err = tlsInfo.ClientConfig()

tools/rebasehelpers/godepchecker/godepchecker.go

@@ -86,7 +86,7 @@ func main() {
 	// Check `ours` for different levels
 	openshiftForks := sets.NewString(
 		"github.com/docker/distribution",
-		"github.com/coreos/etcd",
+		"go.etcd.io/etcd",
 		"github.com/emicklei/go-restful",
 		"k8s.io/klog",
 		"github.com/cloudflare/cfssl",