Skip to content

Commit 48a81a8

Browse files
authored
Merge pull request #17734 from pnasrat/logs-tail-output
No style for logs delimiter output
2 parents 45baa32 + 1d1c6f3 commit 48a81a8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Diff for: pkg/minikube/logs/logs.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.Cluster
184184
failed := []string{}
185185
for i, name := range names {
186186
if i > 0 {
187-
out.Styled(style.Empty, "")
187+
out.Styled(style.None, "")
188188
}
189-
out.Styled(style.Empty, "==> {{.name}} <==", out.V{"name": name})
189+
out.Styled(style.None, "==> {{.name}} <==", out.V{"name": name})
190190
var b bytes.Buffer
191191
c := exec.Command("/bin/bash", "-c", cmds[name])
192192
c.Stdout = &b
@@ -205,7 +205,7 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.Cluster
205205
klog.Errorf("failed to read output: %v", err)
206206
failed = append(failed, name)
207207
}
208-
out.Styled(style.Empty, l)
208+
out.Styled(style.None, l)
209209
}
210210

211211
if len(failed) > 0 {
@@ -216,25 +216,25 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.Cluster
216216

217217
// outputAudit displays the audit logs.
218218
func OutputAudit(lines int) error {
219-
out.Styled(style.Empty, "")
220-
out.Styled(style.Empty, "==> Audit <==")
219+
out.Styled(style.None, "")
220+
out.Styled(style.None, "==> Audit <==")
221221
r, err := audit.Report(lines)
222222
if err != nil {
223223
return fmt.Errorf("failed to create audit report: %v", err)
224224
}
225-
out.Styled(style.Empty, r.ASCIITable())
225+
out.Styled(style.None, r.ASCIITable())
226226
return nil
227227
}
228228

229229
// outputLastStart outputs the last start logs.
230230
func OutputLastStart() error {
231-
out.Styled(style.Empty, "")
232-
out.Styled(style.Empty, "==> Last Start <==")
231+
out.Styled(style.None, "")
232+
out.Styled(style.None, "==> Last Start <==")
233233
fp := localpath.LastStartLog()
234234
f, err := os.Open(fp)
235235
if os.IsNotExist(err) {
236236
msg := fmt.Sprintf("Last start log file not found at %s", fp)
237-
out.Styled(style.Empty, msg)
237+
out.Styled(style.None, msg)
238238
return nil
239239
}
240240
if err != nil {
@@ -246,7 +246,7 @@ func OutputLastStart() error {
246246
for s.Scan() {
247247
l += s.Text() + "\n"
248248
}
249-
out.Styled(style.Empty, l)
249+
out.Styled(style.None, l)
250250
if err := s.Err(); err != nil {
251251
return fmt.Errorf("failed to read file %s: %v", fp, err)
252252
}
@@ -266,7 +266,7 @@ func OutputOffline(lines int, logOutput *os.File) {
266266
klog.Errorf("failed to output last start logs: %v", err)
267267
}
268268

269-
out.Styled(style.Empty, "")
269+
out.Styled(style.None, "")
270270
}
271271

272272
// logCommands returns a list of commands that would be run to receive the anticipated logs

0 commit comments

Comments
 (0)