feat: Change the file name convention when downloading pod logs #19938
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
Signed-off-by: itaynvn-runai <itay.anavian@run.ai>
Signed-off-by: itaynvn-runai <itay.anavian@run.ai>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #19938 +/- ##
==========================================
- Coverage 55.83% 55.81% -0.03%
==========================================
Files 320 320
Lines 44381 44396 +15
==========================================
- Hits 24782 24778 -4
- Misses 17029 17055 +26
+ Partials 2570 2563 -7 ☔ View full report in Codecov by Sentry. |
reggie-k
reviewed
Sep 16, 2024
nitishfy
reviewed
Sep 16, 2024
| fileName := "log" | ||
| if container := req.URL.Query().Get("container"); len(container) > 0 && kube.IsValidResourceName(container) { | ||
| fileName = container | ||
| if kube.IsValidResourceName(appNamespace) && kube.IsValidResourceName(podName) { |
There was a problem hiding this comment.
Suggested change
| if kube.IsValidResourceName(appNamespace) && kube.IsValidResourceName(podName) { | |
| if kube.IsValidResourceName(appNamespace) && kube.IsValidResourceName(podName) { |
appNameswpace is argocd always (until you change the namespace where argocd has been installed). Instead, the namespace should be the one that the pod is part of. Furthermore, testing the above changes will give me a filename as argocd-my-app-dev-798dbbd986-kc2vz.log. If my pod wasn't part of deployment, I'd want to have log file in this format - <namespace that pod is part of>-<pod-name>.
changed `appNamespace` to `namespace`. as `appNamespace` will always be "argocd", and `namespace` is based on the actual k8s namespace, and will be unique. so each log file name will always be unique, and descriptive. Signed-off-by: itaynvn-runai <165032271+itaynvn-runai@users.noreply.github.com>
gdsoumya
requested changes
Sep 17, 2024
| if container := req.URL.Query().Get("container"); len(container) > 0 && kube.IsValidResourceName(container) { | ||
| fileName = container | ||
| if kube.IsValidResourceName(namespace) && kube.IsValidResourceName(podName) { | ||
| fileName = fmt.Sprintf("%s-%s", namespace, podName) |
There was a problem hiding this comment.
+1 to Regina's comment we should append container name to this too.
added `container` to the file name Signed-off-by: itaynvn-runai <165032271+itaynvn-runai@users.noreply.github.com>
itay-nvn-nv
commented
Sep 17, 2024
7 tasks
adriananeci
pushed a commit
to adriananeci/argo-cd
that referenced
this pull request
Dec 4, 2024
…proj#19938) * changed log file name convention Signed-off-by: itaynvn-runai <itay.anavian@run.ai> * fixed condition Signed-off-by: itaynvn-runai <itay.anavian@run.ai> * Update forwarder_overwrite.go changed `appNamespace` to `namespace`. as `appNamespace` will always be "argocd", and `namespace` is based on the actual k8s namespace, and will be unique. so each log file name will always be unique, and descriptive. Signed-off-by: itaynvn-runai <165032271+itaynvn-runai@users.noreply.github.com> * Update forwarder_overwrite.go added `container` to the file name Signed-off-by: itaynvn-runai <165032271+itaynvn-runai@users.noreply.github.com> --------- Signed-off-by: itaynvn-runai <itay.anavian@run.ai> Signed-off-by: itaynvn-runai <165032271+itaynvn-runai@users.noreply.github.com> Signed-off-by: Adrian Aneci <aneci@adobe.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #19937
Checklist: