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

adapted the code to execute the wf in the dedicated namespace

Browse Source
This commit is contained in:
pb 2025-04-08 10:09:24 +02:00
parent 08ade1af66
commit 42ee6abcb6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -143,7 +143,8 @@ func executeOutside(argo_file_path string, stepMax int) {
var stdout, stderr io.ReadCloser var stdout, stderr io.ReadCloser
// var stderr io.ReadCloser // var stderr io.ReadCloser
var err error var err error
cmd := exec.Command("argo", "submit", "--log", argo_file_path, "--serviceaccount=argo", "-n", "argo") logger.Debug().Msg("executing :" + "argo submit --log " + argo_file_path + " --serviceaccount sa-" + conf.GetConfig().ExecutionID + " -n " + conf.GetConfig().ExecutionID)
cmd := exec.Command("argo", "submit", "--log", argo_file_path, "--serviceaccount", "sa-"+conf.GetConfig().ExecutionID, "-n", conf.GetConfig().ExecutionID )
if stdout, err = cmd.StdoutPipe(); err != nil { if stdout, err = cmd.StdoutPipe(); err != nil {
wf_logger.Error().Msg("Could not retrieve stdoutpipe " + err.Error()) wf_logger.Error().Msg("Could not retrieve stdoutpipe " + err.Error())
return return

2
workflow_builder/admiralty_setter.go
View File

@ -8,7 +8,7 @@ import (
oclib "cloud.o-forge.io/core/oc-lib" oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/models/peer" "cloud.o-forge.io/core/oc-lib/models/peer"
"cloud.o-forge.io/core/oc-lib/tools" tools "cloud.o-forge.io/core/oc-lib/tools"
) )
type AdmiraltySetter struct { type AdmiraltySetter struct {

2
workflow_builder/argo_builder.go
View File

@ -433,7 +433,7 @@ func (b *ArgoBuilder) CompleteBuild(executionsId string) (string, error) {
if len(template.Metadata.Annotations) > 0 { if len(template.Metadata.Annotations) > 0 {
if resp, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok { if resp, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok {
fmt.Println(resp) fmt.Println(resp)
template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = setter.NodeName template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = "target-" + conf.GetConfig().ExecutionID
} }
} }
} }