Merge pull request #612 from dgageot/simpler-logs

Simpler code that logs containers

Author: r2d4

pkg/skaffold/kaniko/kaniko.go

@@ -47,7 +47,7 @@ func RunKanikoBuild(ctx context.Context, out io.Writer, artifact *v1alpha2.Artif
 	}
 
 	imageList := kubernetes.NewImageList()
-	imageList.AddImage(constants.DefaultKanikoImage)
+	imageList.Add(constants.DefaultKanikoImage)
 
 	logger := kubernetes.NewLogAggregator(out, imageList, kubernetes.NewColorPicker([]*v1alpha2.Artifact{artifact}))
 	if err := logger.Start(ctx); err != nil {
@@ -104,7 +104,7 @@ func RunKanikoBuild(ctx context.Context, out io.Writer, artifact *v1alpha2.Artif
 	}
 
 	defer func() {
-		imageList.RemoveImage(constants.DefaultKanikoImage)
+		imageList.Remove(constants.DefaultKanikoImage)
 		if err := client.CoreV1().Pods("default").Delete(p.Name, &metav1.DeleteOptions{
 			GracePeriodSeconds: new(int64),
 		}); err != nil {

pkg/skaffold/kubernetes/log.go

@@ -91,7 +91,7 @@ func (a *LogAggregator) Start(ctx context.Context) error {
 				}
 
 				if a.podSelector.Select(pod) {
-					go a.streamLogs(ctx, client, pod)
+					a.streamLogs(ctx, client, pod)
 				}
 			}
 		}
@@ -102,9 +102,6 @@ func (a *LogAggregator) Start(ctx context.Context) error {
 
 func (a *LogAggregator) streamLogs(ctx context.Context, client corev1.PodsGetter, pod *v1.Pod) error {
 	pods := client.Pods(pod.Namespace)
-	if err := WaitForPodReady(pods, pod.Name); err != nil {
-		return errors.Wrap(err, "waiting for pod ready")
-	}
 
 	for _, container := range pod.Status.ContainerStatuses {
 		containerID := container.ContainerID
@@ -248,14 +245,15 @@ func NewImageList() *ImageList {
 	}
 }
 
-// AddImage adds an image to the list.
-func (l *ImageList) AddImage(image string) {
+// Add adds an image to the list.
+func (l *ImageList) Add(image string) {
 	l.Lock()
 	l.names[image] = true
 	l.Unlock()
 }
 
-func (l *ImageList) RemoveImage(image string) {
+// Remove removes an image from the list.
+func (l *ImageList) Remove(image string) {
 	l.Lock()
 	delete(l.names, image)
 	l.Unlock()

pkg/skaffold/runner/runner.go

@@ -193,9 +193,9 @@ func (r *SkaffoldRunner) watchBuildDeploy(ctx context.Context, out io.Writer, ar
 		return errors.Wrap(err, "creating deploy watcher")
 	}
 
-	podSelector := kubernetes.NewImageList()
+	imageList := kubernetes.NewImageList()
 	colorPicker := kubernetes.NewColorPicker(artifacts)
-	logger := kubernetes.NewLogAggregator(out, podSelector, colorPicker)
+	logger := kubernetes.NewLogAggregator(out, imageList, colorPicker)
 
 	onChange := func(changedPaths []string) error {
 		logger.Mute()
@@ -215,7 +215,7 @@ func (r *SkaffoldRunner) watchBuildDeploy(ctx context.Context, out io.Writer, ar
 
 		// Update which images are logged.
 		for _, build := range bRes {
-			podSelector.AddImage(build.Tag)
+			imageList.Add(build.Tag)
 		}
 
 		// Make sure all artifacts are redeployed. Not only those that were just rebuilt.