Correct broken whitespace and remove unneeded changes

README.md

@@ -25,7 +25,7 @@ Flannel is focused on networking. For network policy, other projects such as [Ca
 
 The easiest way to deploy flannel with Kubernetes is to use one of several deployment tools and distributions that network clusters with flannel by default. For example, CoreOS's [Tectonic][tectonic] sets up flannel in the Kubernetes clusters it creates using the open source [Tectonic Installer][tectonic-installer] to drive the setup process.
 
-Though not required , it's recommended that flannel uses the Kubernetes API as its backing store which avoids the need to deploy a discrete `etcd` cluster for `flannel `. This `flannel`mode is known as the *kube subnet manager*.
+Though not required, it's recommended that flannel uses the Kubernetes API as its backing store which avoids the need to deploy a discrete `etcd` cluster for `flannel`. This `flannel` mode is known as the *kube subnet manager*.
 
 ### Deploying flannel manually
 
@@ -65,10 +65,9 @@ See [CONTRIBUTING][contributing] for details on submitting patches and the contr
 
 See [reporting bugs][reporting] for details about reporting any issues.
 
-  ## License
-   
- 
-  Flannel is under the Apache 2.0 license. See the [LICENSE][license] file for details. 
+## License
+
+Flannel is under the Apache 2.0 license. See the [LICENSE][license] file for details.
 
 [calico]: http://www.projectcalico.org
 [pod-cidr]: https://kubernetes.io/docs/admin/kubelet/

subnet/etcdv2/mock_registry.go

@@ -31,7 +31,6 @@ var clock clockwork.Clock = clockwork.NewRealClock()
 
 type netwk struct {
 	config        string
-	backendData   string
 	subnets       []Lease
 	subnetsEvents chan event
 

subnet/etcdv2/registry.go

@@ -298,27 +298,6 @@ func parseSubnetWatchResponse(resp *etcd.Response) (Event, error) {
 	}
 }
 
-func (esr *etcdSubnetRegistry) createBackendData(ctx context.Context, network, data string) error {
-	key := path.Join(esr.etcdCfg.Prefix, network, "backend-data")
-	_, err := esr.client().Create(ctx, key, data)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (esr *etcdSubnetRegistry) getBackendData(ctx context.Context, network string) (string, error) {
-	key := path.Join(esr.etcdCfg.Prefix, network, "backend-data")
-	etcdResponse, err := esr.client().Get(ctx, key, nil)
-
-	if err != nil {
-		return "", err
-	}
-
-	return etcdResponse.Node.Value, nil
-}
-
 func nodeToLease(node *etcd.Node) (*Lease, error) {
 	sn := ParseSubnetKey(node.Key)
 	if sn == nil {

subnet/subnet.go

@@ -47,11 +47,6 @@ type Lease struct {
 	Asof uint64
 }
 
-type BackendAttrs struct {
-	Password    string
-	BackendType string
-}
-
 func (l *Lease) Key() string {
 	return MakeSubnetKey(l.Subnet)
 }