From a2eadbb654bb555aa07e6e0152071ede7db1244e Mon Sep 17 00:00:00 2001 From: Diego Ciangottini Date: Mon, 30 Oct 2023 22:20:30 +0100 Subject: [PATCH] fix get logs --- pkg/sidecars/slurm/GetLogs.go | 7 +------ pkg/virtualkubelet/virtualkubelet.go | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/sidecars/slurm/GetLogs.go b/pkg/sidecars/slurm/GetLogs.go index ce415911..8aa7444a 100644 --- a/pkg/sidecars/slurm/GetLogs.go +++ b/pkg/sidecars/slurm/GetLogs.go @@ -45,12 +45,7 @@ func GetLogsHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(statusCode) return } else { - JIDs = append(JIDs, JidStruct{PodUID: "58b735d3-3973-4474-bdda-949978cd13a3", JID: "123456"}) - for _, jid := range JIDs { - if jid.PodUID == req.PodUID { - cmd = OSexec.Command("cat", "slurm-"+jid.JID+".out") - } - } + cmd = OSexec.Command("cat", "slurm-"+req.PodUID+"_*") } output, err := cmd.CombinedOutput() diff --git a/pkg/virtualkubelet/virtualkubelet.go b/pkg/virtualkubelet/virtualkubelet.go index c1477f33..434596d5 100644 --- a/pkg/virtualkubelet/virtualkubelet.go +++ b/pkg/virtualkubelet/virtualkubelet.go @@ -608,6 +608,7 @@ func (p *VirtualKubeletProvider) GetLogs(ctx context.Context, namespace, podName logsRequest := commonIL.LogStruct{ Namespace: namespace, + PodUID: string(p.pods[podName].UID), PodName: podName, ContainerName: containerName, Opts: commonIL.ContainerLogOpts(opts),