Skip to content

Commit 5dc0b06

Browse files
committed
fix(drain): Pass context to drainer
Fixes #27
1 parent fceac23 commit 5dc0b06

File tree

223 files changed

+23347
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+23347
-2
lines changed

k8s/client.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ type KubernetesClientApi interface {
3737
}
3838

3939
type KubernetesClient struct {
40-
client *kubernetes.Clientset
40+
client kubernetes.Interface
4141
}
4242

4343
// NewKubernetesClient creates a new KubernetesClient
44-
func NewKubernetesClient(client *kubernetes.Clientset) *KubernetesClient {
44+
func NewKubernetesClient(client kubernetes.Interface) *KubernetesClient {
4545
return &KubernetesClient{
4646
client: client,
4747
}
@@ -134,6 +134,7 @@ func (k *KubernetesClient) Drain(nodeName string, ignoreDaemonSets, deleteEmptyD
134134
DeleteEmptyDirData: deleteEmptyDirData,
135135
GracePeriodSeconds: -1,
136136
Timeout: 5 * time.Minute,
137+
Ctx: context.TODO(),
137138
Out: drainLogger{NodeName: nodeName},
138139
ErrOut: drainLogger{NodeName: nodeName},
139140
OnPodDeletedOrEvicted: func(pod *v1.Pod, usingEviction bool) {

k8s/client_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package k8s
2+
3+
import (
4+
"testing"
5+
6+
v1 "k8s.io/api/core/v1"
7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
fakekubernetes "k8s.io/client-go/kubernetes/fake"
9+
)
10+
11+
func TestKubernetesClient_Drain(t *testing.T) {
12+
fakeKubernetesClient := fakekubernetes.NewSimpleClientset(&v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "default"}})
13+
kc := NewKubernetesClient(fakeKubernetesClient)
14+
err := kc.Drain("default", true, true)
15+
if err != nil {
16+
t.Errorf("Unexpected error: %v", err)
17+
}
18+
}

vendor/k8s.io/client-go/discovery/fake/discovery.go

Lines changed: 166 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)