Fix #6: Occasional deadlock during drain

Move from github.com/openshift/kubernetes-drain to github.com/openshift/cluster-api/pkg/drain

go.mod

@@ -4,24 +4,27 @@ go 1.14
 
 require (
 	github.com/aws/aws-sdk-go v1.30.19
-	github.com/evanphx/json-patch v3.0.0+incompatible // indirect
 	github.com/go-log/log v0.2.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/google/btree v1.0.0 // indirect
+	github.com/google/go-cmp v0.4.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/json-iterator/go v1.1.9 // indirect
-	github.com/openshift/kubernetes-drain v0.0.0-20190727205423-d20a33f09dbf
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/openshift/cluster-api v0.0.0-20191129101638-b09907ac6668
+	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/api v0.0.0-20181204000039-89a74a8d264d
-	k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/klog v1.0.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 // indirect
+	k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
+	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
+	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
+
+replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+
+replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90

k8s/client.go

@@ -2,7 +2,7 @@ package k8s
 
 import (
 	"fmt"
-	drain "github.com/openshift/kubernetes-drain"
+	"github.com/openshift/cluster-api/pkg/drain"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -80,7 +80,6 @@ func (k *KubernetesClient) Drain(nodeName string, ignoreDaemonSets, deleteLocalD
 	if err != nil {
 		return err
 	}
-	// set options and drain nodes
 	return drain.Drain(k.client, []*v1.Node{node}, &drain.DrainOptions{
 		IgnoreDaemonsets:   ignoreDaemonSets,
 		GracePeriodSeconds: -1,