Skip to content

K
k3s
Unverified Commit cce67ed8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #62753 from Random-Liu/fix-extra-log

Automatic merge from submit-queue (batch tested with PRs 62568, 62220, 62743, 62751, 62753). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix extra-log flag for node e2e. Similar with https://github.com/kubernetes/kubernetes/pull/62670. Without this, test-infra can't collect extra logs, such as contianerd log. Signed-off-by: 's avatarLantao Liu <lantaol@google.com> **Release note**: ```release-note none ```
parents d6e64a97 c86e85c4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
test/e2e_node/services/logs.go
View file @ cce67ed8
...@@ -44,12 +44,6 @@ func (l *logFiles) String() string { ...@@ -44,12 +44,6 @@ func (l *logFiles) String() string {
// Set function of flag.Value // Set function of flag.Value
func (l *logFiles) Set(value string) error { func (l *logFiles) Set(value string) error {
// Someone else is calling flag.Parse after the flags are parsed in the
// test framework. Use this to avoid the flag being parsed twice.
// TODO(random-liu): Figure out who is parsing the flags.
if flag.Parsed() {
return nil
}
var log LogFileData var log LogFileData
if err := json.Unmarshal([]byte(value), &log); err != nil { if err := json.Unmarshal([]byte(value), &log); err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment