From 3d8e2e1171670c8db83598da82f4a17fb4d56744 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Tue, 18 Apr 2017 20:22:08 -0700 Subject: [PATCH] etcdserver: remove 2.0 StatusNotFound version check --- etcdserver/cluster_util.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index fa84ffae6..f44862a46 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -23,7 +23,6 @@ import ( "time" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/pkg/httputil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" @@ -241,15 +240,6 @@ func getVersion(m *membership.Member, rt http.RoundTripper) (*version.Versions, plog.Warningf("failed to reach the peerURL(%s) of member %s (%v)", u, m.ID, err) continue } - // etcd 2.0 does not have version endpoint on peer url. - if resp.StatusCode == http.StatusNotFound { - httputil.GracefulClose(resp) - return &version.Versions{ - Server: "2.0.0", - Cluster: "2.0.0", - }, nil - } - var b []byte b, err = ioutil.ReadAll(resp.Body) resp.Body.Close()