Fix skaffold deploy --tail

integration/deploy_test.go

@@ -17,8 +17,10 @@ limitations under the License.
 package integration
 
 import (
+	"bufio"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
@@ -99,6 +101,43 @@ func TestDeploy(t *testing.T) {
 	skaffold.Delete().InDir("examples/kustomize").InNs(ns.Name).RunOrFail(t)
 }
 
+func TestDeployTail(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
+
+	ns, _, deleteNs := SetupNamespace(t)
+	defer deleteNs()
+
+	out, cancel := skaffold.Deploy("--tail", "--images", "busybox:latest").InDir("testdata/deploy-hello-tail").InNs(ns.Name).RunBackgroundOutput(t)
+	defer cancel()
+
+	// Wait for the logs to print "Hello world!"
+	lines := make(chan string)
+	go func() {
+		scanner := bufio.NewScanner(out)
+		for scanner.Scan() {
+			lines <- scanner.Text()
+		}
+	}()
+
+	timer := time.NewTimer(30 * time.Second)
+	defer timer.Stop()
+	for {
+		select {
+		case <-timer.C:
+			t.Fatal("timeout")
+		case line := <-lines:
+			if strings.Contains(line, "Hello world!") {
+				return
+			}
+		}
+	}
+}
+
 func TestDeployWithInCorrectConfig(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")

integration/skaffold/helper.go

@@ -127,12 +127,22 @@ func (b *RunBuilder) WithEnv(env []string) *RunBuilder {
 }
 
 // RunBackground runs the skaffold command in the background.
-// This also returns a teardown function that stops skaffold.
+// Returns a teardown function that stops skaffold.
 func (b *RunBuilder) RunBackground(t *testing.T) context.CancelFunc {
+	_, cancel := b.RunBackgroundOutput(t)
+	return cancel
+}
+
+// RunBackgroundOutput runs the skaffold command in the background.
+// Returns a teardown function that stops skaffold.
+func (b *RunBuilder) RunBackgroundOutput(t *testing.T) (io.ReadCloser, context.CancelFunc) {
 	t.Helper()
 
+	pr, pw := io.Pipe()
+
 	ctx, cancel := context.WithCancel(context.Background())
 	cmd := b.cmd(ctx)
+	cmd.Stdout = pw
 	logrus.Infoln(cmd.Args)
 
 	start := time.Now()
@@ -145,9 +155,10 @@ func (b *RunBuilder) RunBackground(t *testing.T) context.CancelFunc {
 		logrus.Infoln("Ran in", time.Since(start))
 	}()
 
-	return func() {
+	return pr, func() {
 		cancel()
 		cmd.Wait()
+		pr.Close()
 	}
 }
 

integration/testdata/deploy-hello-tail/k8s/pod.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: busybox-hello
+spec:
+  containers:
+  - name: busybox-hello
+    image: busybox
+    args:
+      - sh
+      - -c
+      - "while :; do echo 'Hello world!'; sleep 1; done"

integration/testdata/deploy-hello-tail/skaffold.yaml

@@ -0,0 +1,2 @@
+apiVersion: skaffold/v1beta16
+kind: Config

pkg/skaffold/runner/build_deploy.go

@@ -92,6 +92,7 @@ func (r *SkaffoldRunner) DeployAndLog(ctx context.Context, out io.Writer, artifa
 	var imageNames []string
 	for _, artifact := range artifacts {
 		imageNames = append(imageNames, artifact.ImageName)
+		r.podSelector.Add(artifact.Tag)
 	}
 
 	logger := r.newLoggerForImages(out, imageNames)