Copy collector enhanced #237
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ import ( | |
| "context" | ||
| "fmt" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1" | ||
| corev1 "k8s.io/api/core/v1" | ||
|
|
@@ -14,6 +15,7 @@ import ( | |
| ) | ||
|
|
||
| func Copy(c *Collector, copyCollector *troubleshootv1beta1.Copy) (map[string][]byte, error) { | ||
|
|
||
| client, err := kubernetes.NewForConfig(c.ClientConfig) | ||
| if err != nil { | ||
| return nil, err | ||
|
|
@@ -56,12 +58,13 @@ func Copy(c *Collector, copyCollector *troubleshootv1beta1.Copy) (map[string][]b | |
| } | ||
|
|
||
| func copyFiles(c *Collector, client *kubernetes.Clientset, pod corev1.Pod, copyCollector *troubleshootv1beta1.Copy) (map[string][]byte, map[string]string) { | ||
| files := make(map[string][]byte) | ||
| container := pod.Spec.Containers[0].Name | ||
| if copyCollector.ContainerName != "" { | ||
| container = copyCollector.ContainerName | ||
| } | ||
|
|
||
| command := []string{"find", copyCollector.ContainerPath, "-type", "f"} | ||
|
|
||
| req := client.CoreV1().RESTClient().Post().Resource("pods").Name(pod.Name).Namespace(pod.Namespace).SubResource("exec") | ||
| scheme := runtime.NewScheme() | ||
|
|
@@ -96,6 +99,9 @@ func copyFiles(c *Collector, client *kubernetes.Clientset, pod corev1.Pod, copyC | |
| Stderr: &stderr, | ||
| Tty: false, | ||
| }) | ||
|
|
||
| filepaths := strings.Split(output.String(), "\n") | ||
|
|
||
| if err != nil { | ||
| errors := map[string]string{ | ||
| filepath.Join(copyCollector.ContainerPath, "error"): err.Error(), | ||
|
|
@@ -109,9 +115,59 @@ func copyFiles(c *Collector, client *kubernetes.Clientset, pod corev1.Pod, copyC | |
| return nil, errors | ||
| } | ||
|
|
||
| for _, file := range filepaths { | ||
| if file != "" { | ||
| command := []string{"cat", file} | ||
|
|
||
| req := client.CoreV1().RESTClient().Post().Resource("pods").Name(pod.Name).Namespace(pod.Namespace).SubResource("exec") | ||
|
There was a problem hiding this comment. This is unnecessarily verbose. Is cleaner and how we use the clientset There was a problem hiding this comment. @CodeLingoBot capture unnecessary use of client-go restClient There was a problem hiding this comment. Rule captured at https://dash.codelingo.io/repos/replicatedhq/troubleshoot/rules/1393 CodeLingoBot HelpWhen responding to PR-level comments, I understand the following commands:
When responding to comments on specific lines of code, I understand the following commands:
There was a problem hiding this comment. Hi Marc! I didn't have much contact with the client set yet, so I left that line as it was. The way you suggest returns another type of variable and requires another type of variable too instead of pod.Name. I didn't investigate it further because I am sure I will have to deal with the clientset in later PR's, and I didn't wanted to delay the copy collector. |
||
| scheme := runtime.NewScheme() | ||
| if err := corev1.AddToScheme(scheme); err != nil { | ||
| return nil, map[string]string{ | ||
| filepath.Join(copyCollector.ContainerPath, "error"): err.Error(), | ||
| } | ||
| } | ||
| parameterCodec := runtime.NewParameterCodec(scheme) | ||
| req.VersionedParams(&corev1.PodExecOptions{ | ||
| Command: command, | ||
| Container: container, | ||
| Stdin: true, | ||
| Stdout: false, | ||
| Stderr: true, | ||
| TTY: false, | ||
| }, parameterCodec) | ||
|
|
||
| exec, err := remotecommand.NewSPDYExecutor(c.ClientConfig, "POST", req.URL()) | ||
| if err != nil { | ||
| return nil, map[string]string{ | ||
| filepath.Join(copyCollector.ContainerPath, "error"): err.Error(), | ||
| } | ||
| } | ||
|
|
||
| output := new(bytes.Buffer) | ||
| var stderr bytes.Buffer | ||
| err = exec.Stream(remotecommand.StreamOptions{ | ||
| Stdin: nil, | ||
| Stdout: output, | ||
| Stderr: &stderr, | ||
| Tty: false, | ||
| }) | ||
| files[file] = output.Bytes() | ||
|
|
||
| if err != nil { | ||
| errors := map[string]string{ | ||
| filepath.Join(copyCollector.ContainerPath, "error"): err.Error(), | ||
| } | ||
| if s := output.String(); len(s) > 0 { | ||
| errors[filepath.Join(copyCollector.ContainerPath, "stdout")] = s | ||
| } | ||
| if s := stderr.String(); len(s) > 0 { | ||
| errors[filepath.Join(copyCollector.ContainerPath, "stderr")] = s | ||
| } | ||
| return nil, errors | ||
| } | ||
| } | ||
| } | ||
| return files, nil | ||
| } | ||
|
|
||
| func getCopyErrosFileName(copyCollector *troubleshootv1beta1.Copy) string { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would be better written has
The code is less conditionally indented and more readable this way
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CodeLingoBot capture continue in conditional in loop
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rule captured at https://dash.codelingo.io/repos/replicatedhq/troubleshoot/rules/1392
CodeLingoBot Help
When responding to PR-level comments, I understand the following commands:
captureto capture the context for a fresh rule.reviewto trigger a fresh review.When responding to comments on specific lines of code, I understand the following commands:
captureto capture the context for a fresh rule.reviewto trigger a fresh review.ignoreto ignore the parent review comment.unignoreto stop ignoring a parent review comment.