core/oc-monitord
6
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

removed the debug comments

Browse Source
This commit is contained in:
pb 2025-05-19 18:58:33 +02:00
parent e1b0ad089c
commit 6917295fbd
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
logger/argo_logs.go
View File

@ -168,7 +168,7 @@ func LogKubernetesArgo(wfName string, namespace string, watcher watch.Interface)
if !slices.Contains(pods,pod.Name){ if !slices.Contains(pods,pod.Name){
pl := wfl.With().Str("pod", pod.Name).Logger() pl := wfl.With().Str("pod", pod.Name).Logger()
if wfName == pod.Name { pods = append(pods, pod.Name); continue } // One of the node is the Workflow, the others are the pods so don't try to log on the wf name if wfName == pod.Name { pods = append(pods, pod.Name); continue } // One of the node is the Workflow, the others are the pods so don't try to log on the wf name
fmt.Println("Found a new pod to log : " + pod.Name) pl.Info().Msg("Found a new pod to log : " + pod.Name)
wg.Add(1) wg.Add(1)
go logKubernetesPods(namespace, wfName, pod.Name, pl, &wg) go logKubernetesPods(namespace, wfName, pod.Name, pl, &wg)
pods = append(pods, pod.Name) pods = append(pods, pod.Name)
@ -222,10 +222,6 @@ func logKubernetesPods(executionId string, wfName string,podName string, logger
return return
} }
fmt.Println("=======================")
fmt.Println("Starting to log " + name)
fmt.Println("=======================")
scanner := bufio.NewScanner(reader) scanner := bufio.NewScanner(reader)
for scanner.Scan() { for scanner.Scan() {
log := scanner.Text() log := scanner.Text()
@ -234,8 +230,4 @@ func logKubernetesPods(executionId string, wfName string,podName string, logger
logger.Info().Msg(string(jsonified)) logger.Info().Msg(string(jsonified))
} }
wg.Done()
fmt.Println("=======================")
fmt.Println("Finishing to log " + name)
fmt.Println("=======================")
} }

3
tools/kubernetes.go
View File

@ -144,7 +144,6 @@ func (k *KubernetesTools) GetPodLogger(ns string, wfName string, nodeName string
return nil, fmt.Errorf("no pods found with label workflows.argoproj.io/workflow="+ wfName + " no pods found with label workflows.argoproj.io/node-name=" + nodeName + " in namespace " + ns) return nil, fmt.Errorf("no pods found with label workflows.argoproj.io/workflow="+ wfName + " no pods found with label workflows.argoproj.io/node-name=" + nodeName + " in namespace " + ns)
} }
fmt.Println("Searching for workflows.argoproj.io/node-name=" + nodeName)
for _, pod := range pods.Items { for _, pod := range pods.Items {
if pod.Annotations["workflows.argoproj.io/node-name"] == nodeName { if pod.Annotations["workflows.argoproj.io/node-name"] == nodeName {
targetPod = pod targetPod = pod
@ -173,12 +172,10 @@ func (k *KubernetesTools) testPodReady(pod v1.Pod, ns string) {
} }
var initialized bool var initialized bool
fmt.Println("============= \n " + pod.Name + " not ready yet \n==============")
for _, cond := range pod.Status.Conditions { for _, cond := range pod.Status.Conditions {
// It seems that for remote pods the pod gets the Succeeded status before it has time to display the it is ready to run in .status.conditions,so we added the OR condition // It seems that for remote pods the pod gets the Succeeded status before it has time to display the it is ready to run in .status.conditions,so we added the OR condition
if (cond.Type == v1.PodReady && cond.Status == v1.ConditionTrue) || pod.Status.Phase == v1.PodSucceeded { if (cond.Type == v1.PodReady && cond.Status == v1.ConditionTrue) || pod.Status.Phase == v1.PodSucceeded {
initialized = true initialized = true
fmt.Println("============= \n " + pod.Name + " ready \n==============")
return return
} }
} }