From 045bd4932b7bd9888b99755b00b1106b535753cd Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 28 Feb 2024 16:42:18 +0100 Subject: [PATCH] Continue attemps to dump artifacts in `toolbox dump` This way if one of the earlier methods fails, we can still get some artifacts from the later methods --- cmd/kops/toolbox_dump.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kops/toolbox_dump.go b/cmd/kops/toolbox_dump.go index c5e423f757..cd07ca8c71 100644 --- a/cmd/kops/toolbox_dump.go +++ b/cmd/kops/toolbox_dump.go @@ -232,7 +232,7 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer, } if err := dumper.DumpAllNodes(ctx, nodes, options.MaxNodes, additionalIPs, additionalPrivateIPs); err != nil { - return fmt.Errorf("error dumping nodes: %v", err) + klog.Warningf("error dumping nodes: %v", err) } if kubeConfig != nil && options.K8sResources { @@ -241,7 +241,7 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer, return fmt.Errorf("error creating resource dumper: %w", err) } if err := dumper.DumpResources(ctx); err != nil { - return fmt.Errorf("error dumping resources: %w", err) + klog.Warningf("error dumping resources: %v", err) } logDumper, err := dump.NewPodLogDumper(kubeConfig, options.Dir) @@ -249,7 +249,7 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer, return fmt.Errorf("error creating pod log dumper: %w", err) } if err := logDumper.DumpLogs(ctx); err != nil { - return fmt.Errorf("error dumping pod logs: %w", err) + klog.Warningf("error dumping pod logs: %v", err) } } }