*: migrate openshift assets to new etcd org

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>

Dockerfile.openshift

@@ -1,6 +1,6 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 
-WORKDIR /go/src/github.com/coreos/etcd
+WORKDIR /go/src/go.etcd.io/etcd
 
 COPY . .
 
@@ -11,9 +11,9 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 
 ENTRYPOINT ["/usr/bin/etcd"]
 
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/discover-etcd-initial-cluster /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/discover-etcd-initial-cluster /usr/bin/
 
 LABEL io.k8s.display-name="etcd server" \
       io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \

Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM openshift/golang-builder:1.12 AS builder
 
-WORKDIR /go/src/github.com/coreos/etcd
+WORKDIR /go/src/go.etcd.io/etcd
 
 COPY . .
 
@@ -11,9 +11,9 @@ FROM openshift/origin-base
 
 ENTRYPOINT ["/usr/bin/etcd"]
 
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/
-COPY --from=builder /go/src/github.com/coreos/etcd/bin/discover-etcd-initial-cluster /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/discover-etcd-initial-cluster /usr/bin/
 
 LABEL io.k8s.display-name="etcd server" \
       io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \

Makefile

@@ -12,7 +12,7 @@
 
 .PHONY: build
 build:
-	GO_BUILD_FLAGS="-v" ./build
+	GO111MODULE=on GO_BUILD_FLAGS="-v -mod vendor" ./build
 	./bin/etcd --version
 	./bin/etcdctl version
 

build

@@ -75,7 +75,7 @@ openshift_tools_build() {
 	CGO_ENABLED=0 go build $GO_BUILD_FLAGS \
 		-installsuffix cgo \
 		-ldflags "$GO_LDFLAGS" \
-		-o "${out}/discover-etcd-initial-cluster" "github.com/coreos/etcd/openshift-tools/discover-etcd-initial-cluster" || return
+		-o "${out}/discover-etcd-initial-cluster" "go.etcd.io/etcd/openshift-tools/discover-etcd-initial-cluster" || return
 }
 
 tools_build() {

go.mod

@@ -48,3 +48,5 @@ require (
 	gopkg.in/yaml.v2 v2.2.2
 	sigs.k8s.io/yaml v1.1.0
 )
+
+go 1.13

openshift-tools/discover-etcd-initial-cluster/main.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	discover_etcd_initial_cluster "github.com/coreos/etcd/openshift-tools/pkg/discover-etcd-initial-cluster"
 	"github.com/spf13/pflag"
+	discover_etcd_initial_cluster "go.etcd.io/etcd/openshift-tools/pkg/discover-etcd-initial-cluster"
 )
 
 // copy from `utilflag "k8s.io/component-base/cli/flag"`

openshift-tools/pkg/discover-etcd-initial-cluster/initial-cluster.go

@@ -8,16 +8,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 
-	"github.com/coreos/etcd/pkg/transport"
 	"google.golang.org/grpc"
 
-	"github.com/coreos/etcd/clientv3"
-
-	"github.com/spf13/pflag"
-
-	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 type DiscoverEtcdInitialClusterOptions struct {
@@ -195,7 +193,7 @@ func (o *DiscoverEtcdInitialClusterOptions) Run() error {
 		if len(member.Name) == 0 { // this is the signal for whether or not a given peer is started
 			continue
 		}
-		for _, peerURL := range member.PeerURLs{
+		for _, peerURL := range member.PeerURLs {
 			etcdInitialClusterEntries = append(etcdInitialClusterEntries, fmt.Sprintf("%s=%s", member.Name, peerURL))
 		}
 	}