Support k8s client-go 1.18

StrongMonkey · Jul 22, 2020 · 1373118 · 1373118
1 parent 59c2bf8
commit 1373118
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/stern/tail.go b/stern/tail.go
@@ -106,7 +106,7 @@ func (t *Tail) Start(ctx context.Context, i v1.PodInterface, logC chan<- string)
 			TailLines:    t.Options.TailLines,
 		})
 
-		stream, err := req.Stream()
+		stream, err := req.Stream(ctx)
 		if err != nil {
 			fmt.Println(errors.Wrapf(err, "Error opening stream to %s/%s: %s\n", t.Namespace, t.PodName, t.ContainerName))
 			t.Active = false

diff --git a/stern/watch.go b/stern/watch.go
@@ -44,7 +44,7 @@ func (t *Target) GetID() string {
 // containers/pods. The first result is targets added, the second is targets
 // removed
 func Watch(ctx context.Context, i v1.PodInterface, podFilter *regexp.Regexp, containerFilter *regexp.Regexp, containerExcludeFilter *regexp.Regexp, initContainers bool, containerState ContainerState, labelSelector labels.Selector) (chan *Target, chan *Target, error) {
-	watcher, err := i.Watch(metav1.ListOptions{Watch: true, LabelSelector: labelSelector.String()})
+	watcher, err := i.Watch(ctx, metav1.ListOptions{Watch: true, LabelSelector: labelSelector.String()})
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "failed to set up watch")
 	}