Merge pull request #55140 from feiskyer/cri-logs

pkg/kubelet/kuberuntime/BUILD

@@ -34,6 +34,7 @@ go_library(
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/images:go_default_library",
+        "//pkg/kubelet/kuberuntime/logs:go_default_library",
         "//pkg/kubelet/lifecycle:go_default_library",
         "//pkg/kubelet/metrics:go_default_library",
         "//pkg/kubelet/prober/results:go_default_library",
@@ -48,8 +49,6 @@ go_library(
         "//pkg/util/tail:go_default_library",
         "//pkg/util/version:go_default_library",
         "//vendor/github.com/armon/circbuf:go_default_library",
-        "//vendor/github.com/docker/docker/pkg/jsonlog:go_default_library",
-        "//vendor/github.com/fsnotify/fsnotify:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
@@ -73,7 +72,6 @@ go_test(
         "kuberuntime_container_test.go",
         "kuberuntime_gc_test.go",
         "kuberuntime_image_test.go",
-        "kuberuntime_logs_test.go",
         "kuberuntime_manager_test.go",
         "kuberuntime_sandbox_test.go",
         "labels_test.go",
@@ -113,6 +111,9 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [":package-srcs"],
+    srcs = [
+        ":package-srcs",
+        "//pkg/kubelet/kuberuntime/logs:all-srcs",
+    ],
     tags = ["automanaged"],
 )

pkg/kubelet/kuberuntime/logs/BUILD

+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["logs.go"],
+    importpath = "k8s.io/kubernetes/pkg/kubelet/kuberuntime/logs",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
+        "//pkg/util/tail:go_default_library",
+        "//vendor/github.com/docker/docker/pkg/jsonlog:go_default_library",
+        "//vendor/github.com/fsnotify/fsnotify:go_default_library",
+        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["logs_test.go"],
+    importpath = "k8s.io/kubernetes/pkg/kubelet/kuberuntime/logs",
+    library = ":go_default_library",
+    deps = [
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

pkg/kubelet/kuberuntime/kuberuntime_logs_test.go → pkg/kubelet/kuberuntime/logs/logs_test.go

 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kuberuntime
+package logs
 
 import (
 	"bytes"
@@ -36,31 +36,31 @@ func TestLogOptions(t *testing.T) {
 	)
 	for c, test := range []struct {
 		apiOpts *v1.PodLogOptions
-		expect  *logOptions
+		expect  *LogOptions
 	}{
 		{ // empty options
 			apiOpts: &v1.PodLogOptions{},
-			expect:  &logOptions{tail: -1, bytes: -1},
+			expect:  &LogOptions{tail: -1, bytes: -1},
 		},
 		{ // test tail lines
 			apiOpts: &v1.PodLogOptions{TailLines: &line},
-			expect:  &logOptions{tail: line, bytes: -1},
+			expect:  &LogOptions{tail: line, bytes: -1},
 		},
 		{ // test limit bytes
 			apiOpts: &v1.PodLogOptions{LimitBytes: &bytes},
-			expect:  &logOptions{tail: -1, bytes: bytes},
+			expect:  &LogOptions{tail: -1, bytes: bytes},
 		},
 		{ // test since timestamp
 			apiOpts: &v1.PodLogOptions{SinceTime: &timestamp},
-			expect:  &logOptions{tail: -1, bytes: -1, since: timestamp.Time},
+			expect:  &LogOptions{tail: -1, bytes: -1, since: timestamp.Time},
 		},
 		{ // test since seconds
 			apiOpts: &v1.PodLogOptions{SinceSeconds: &sinceseconds},
-			expect:  &logOptions{tail: -1, bytes: -1, since: timestamp.Add(-10 * time.Second)},
+			expect:  &LogOptions{tail: -1, bytes: -1, since: timestamp.Add(-10 * time.Second)},
 		},
 	} {
 		t.Logf("TestCase #%d: %+v", c, test)
-		opts := newLogOptions(test.apiOpts, timestamp.Time)
+		opts := NewLogOptions(test.apiOpts, timestamp.Time)
 		assert.Equal(t, test.expect, opts)
 	}
 }
@@ -162,7 +162,7 @@ func TestWriteLogs(t *testing.T) {
 		}
 		stdoutBuf := bytes.NewBuffer(nil)
 		stderrBuf := bytes.NewBuffer(nil)
-		w := newLogWriter(stdoutBuf, stderrBuf, &logOptions{since: test.since, timestamp: test.timestamp, bytes: -1})
+		w := newLogWriter(stdoutBuf, stderrBuf, &LogOptions{since: test.since, timestamp: test.timestamp, bytes: -1})
 		err := w.write(msg)
 		assert.NoError(t, err)
 		assert.Equal(t, test.expectStdout, stdoutBuf.String())
@@ -224,7 +224,7 @@ func TestWriteLogsWithBytesLimit(t *testing.T) {
 		}
 		stdoutBuf := bytes.NewBuffer(nil)
 		stderrBuf := bytes.NewBuffer(nil)
-		w := newLogWriter(stdoutBuf, stderrBuf, &logOptions{timestamp: test.timestamp, bytes: int64(test.bytes)})
+		w := newLogWriter(stdoutBuf, stderrBuf, &LogOptions{timestamp: test.timestamp, bytes: int64(test.bytes)})
 		for i := 0; i < test.stdoutLines; i++ {
 			msg.stream = stdoutType
 			if err := w.write(msg); err != nil {