Simplified k8s API Body watcher code and test. (#923)

runtime/kubernetes/client/watch/body.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"encoding/json"
 	"net/http"
-	"time"
 )
 
 // bodyWatcher scans the body of a request for chunks
@@ -34,43 +33,26 @@ func (wr *bodyWatcher) Stop() {
 func (wr *bodyWatcher) stream() {
 	reader := bufio.NewReader(wr.res.Body)
 
-	// ignore first few messages from stream,
+	// stop the watcher
-	// as they are usually old.
+	defer wr.Stop()
-	ignore := true
 
-	go func() {
+	for {
-		<-time.After(time.Second)
+		// read a line
-		ignore = false
+		b, err := reader.ReadBytes('\n')
-	}()
+		if err != nil {
-
+			return
-	go func() {
-		// stop the watcher
-		defer wr.Stop()
-
-		for {
-			// read a line
-			b, err := reader.ReadBytes('\n')
-			if err != nil {
-				return
-			}
-
-			// ignore for the first second
-			if ignore {
-				continue
-			}
-
-			// send the event
-			var event Event
-			if err := json.Unmarshal(b, &event); err != nil {
-				continue
-			}
-			wr.results <- event
 		}
-	}()
+
+		// send the event
+		var event Event
+		if err := json.Unmarshal(b, &event); err != nil {
+			continue
+		}
+		wr.results <- event
+	}
 }
 
-// NewBodyWatcher creates a k8s body watcher for
+// NewBodyWatcher creates a k8s body watcher for a given http request
-// a given http request
 func NewBodyWatcher(req *http.Request, client *http.Client) (Watch, error) {
 	stop := make(chan struct{})
 	req.Cancel = stop

runtime/kubernetes/client/watch/watch_test.go

@@ -37,17 +37,15 @@ func TestBodyWatcher(t *testing.T) {
 
 	req, err := http.NewRequest("GET", ts.URL, nil)
 	if err != nil {
-		t.Fatalf("did not expect NewRequest to return err: %v", err)
+		t.Fatalf("failed to create new request: %v", err)
 	}
 
 	// setup body watcher
 	w, err := NewBodyWatcher(req, http.DefaultClient)
 	if err != nil {
-		t.Fatalf("did not expect NewBodyWatcher to return %v", err)
+		t.Fatalf("failed to create new BodyWatcher %v", err)
 	}
 
-	<-time.After(time.Second)
-
 	// send action strings in, and expect result back
 	ch <- actions[0]
 	if r := <-w.ResultChan(); r.Type != "create" {