fix get logs

interTwin-eu · Oct 30, 2023 · a2eadbb · a2eadbb
1 parent 0524296
commit a2eadbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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),