From 42ee6abcb633eb3cb36b0a46afa73c92ace2380e Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 8 Apr 2025 10:09:24 +0200 Subject: [PATCH] adapted the code to execute the wf in the dedicated namespace --- main.go | 3 ++- workflow_builder/admiralty_setter.go | 2 +- workflow_builder/argo_builder.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index a316003..dc6658a 100644 --- a/main.go +++ b/main.go @@ -143,7 +143,8 @@ func executeOutside(argo_file_path string, stepMax int) { var stdout, stderr io.ReadCloser // var stderr io.ReadCloser 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 { wf_logger.Error().Msg("Could not retrieve stdoutpipe " + err.Error()) return diff --git a/workflow_builder/admiralty_setter.go b/workflow_builder/admiralty_setter.go index f4af8ef..a2f6c67 100644 --- a/workflow_builder/admiralty_setter.go +++ b/workflow_builder/admiralty_setter.go @@ -8,7 +8,7 @@ import ( oclib "cloud.o-forge.io/core/oc-lib" "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 { diff --git a/workflow_builder/argo_builder.go b/workflow_builder/argo_builder.go index 9cf71a8..f942c9d 100644 --- a/workflow_builder/argo_builder.go +++ b/workflow_builder/argo_builder.go @@ -433,7 +433,7 @@ func (b *ArgoBuilder) CompleteBuild(executionsId string) (string, error) { if len(template.Metadata.Annotations) > 0 { if resp, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok { fmt.Println(resp) - template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = setter.NodeName + template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = "target-" + conf.GetConfig().ExecutionID } } }