Skip to content

Commit 990a380

Browse files
authored
Merge pull request kubernetes#89180 from oomichi/LogOutput
Move podlogs into e2e/storage/testsuites
2 parents 77e70e6 + 017eaf1 commit 990a380

File tree

6 files changed

+4
-4
lines changed

6 files changed

+4
-4
lines changed

test/e2e/framework/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ filegroup(
127127
"//test/e2e/framework/node:all-srcs",
128128
"//test/e2e/framework/perf:all-srcs",
129129
"//test/e2e/framework/pod:all-srcs",
130-
"//test/e2e/framework/podlogs:all-srcs",
131130
"//test/e2e/framework/providers/aws:all-srcs",
132131
"//test/e2e/framework/providers/azure:all-srcs",
133132
"//test/e2e/framework/providers/gce:all-srcs",

test/e2e/storage/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ filegroup(
104104
":package-srcs",
105105
"//test/e2e/storage/drivers:all-srcs",
106106
"//test/e2e/storage/external:all-srcs",
107+
"//test/e2e/storage/podlogs:all-srcs",
107108
"//test/e2e/storage/testpatterns:all-srcs",
108109
"//test/e2e/storage/testsuites:all-srcs",
109110
"//test/e2e/storage/utils:all-srcs",

test/e2e/framework/podlogs/BUILD renamed to test/e2e/storage/podlogs/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
33
go_library(
44
name = "go_default_library",
55
srcs = ["podlogs.go"],
6-
importpath = "k8s.io/kubernetes/test/e2e/framework/podlogs",
6+
importpath = "k8s.io/kubernetes/test/e2e/storage/podlogs",
77
visibility = ["//visibility:public"],
88
deps = [
99
"//staging/src/k8s.io/api/core/v1:go_default_library",
File renamed without changes.

test/e2e/storage/testsuites/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ go_library(
4949
"//test/e2e/framework/metrics:go_default_library",
5050
"//test/e2e/framework/node:go_default_library",
5151
"//test/e2e/framework/pod:go_default_library",
52-
"//test/e2e/framework/podlogs:go_default_library",
5352
"//test/e2e/framework/pv:go_default_library",
5453
"//test/e2e/framework/skipper:go_default_library",
5554
"//test/e2e/framework/volume:go_default_library",
55+
"//test/e2e/storage/podlogs:go_default_library",
5656
"//test/e2e/storage/testpatterns:go_default_library",
5757
"//test/e2e/storage/utils:go_default_library",
5858
"//test/utils/image:go_default_library",

test/e2e/storage/testsuites/base.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import (
4141
csitrans "k8s.io/csi-translation-lib"
4242
"k8s.io/kubernetes/test/e2e/framework"
4343
"k8s.io/kubernetes/test/e2e/framework/metrics"
44-
"k8s.io/kubernetes/test/e2e/framework/podlogs"
4544
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
4645
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4746
"k8s.io/kubernetes/test/e2e/framework/volume"
47+
"k8s.io/kubernetes/test/e2e/storage/podlogs"
4848
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
4949
)
5050

0 commit comments

Comments
 (0)