kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16205 from hakman/dump_chekc_kubeconfig 

Check if kubeconfig exists before dumping resources
This commit is contained in:
Kubernetes Prow Robot 2024-01-03 19:17:21 +01:00 committed by GitHub
parent 29da43bded 71158230bd
commit bbd6521fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kops/toolbox_dump.go
View File

@ -167,11 +167,11 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer,
var nodes corev1.NodeList var nodes corev1.NodeList
config, err := clientGetter.ToRESTConfig() kubeConfig, err := clientGetter.ToRESTConfig()
if err != nil { if err != nil {
klog.Warningf("cannot load kubeconfig settings for %q: %v", contextName, err) klog.Warningf("cannot load kubeconfig settings for %q: %v", contextName, err)
} else { } else {
k8sClient, err := kubernetes.NewForConfig(config) k8sClient, err := kubernetes.NewForConfig(kubeConfig)
if err != nil { if err != nil {
klog.Warningf("cannot build kube client for %q: %v", contextName, err) klog.Warningf("cannot build kube client for %q: %v", contextName, err)
} else { } else {
@ -227,8 +227,9 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer,
if err := dumper.DumpAllNodes(ctx, nodes, additionalIPs, additionalPrivateIPs); err != nil { if err := dumper.DumpAllNodes(ctx, nodes, additionalIPs, additionalPrivateIPs); err != nil {
return fmt.Errorf("error dumping nodes: %v", err) return fmt.Errorf("error dumping nodes: %v", err)
} }
if options.K8sResources {
dumper, err := dump.NewResourceDumper(config, options.Output, options.Dir) if kubeConfig != nil && options.K8sResources {
dumper, err := dump.NewResourceDumper(kubeConfig, options.Output, options.Dir)
if err != nil { if err != nil {
return fmt.Errorf("error creating resource dumper: %w", err) return fmt.Errorf("error creating resource dumper: %w", err)
} }
@ -236,7 +237,7 @@ func RunToolboxDump(ctx context.Context, f commandutils.Factory, out io.Writer,
return fmt.Errorf("error dumping resources: %w", err) return fmt.Errorf("error dumping resources: %w", err)
} }
logDumper, err := dump.NewPodLogDumper(config, options.Dir) logDumper, err := dump.NewPodLogDumper(kubeConfig, options.Dir)
if err != nil { if err != nil {
return fmt.Errorf("error creating pod log dumper: %w", err) return fmt.Errorf("error creating pod log dumper: %w", err)
} }