From ca68f4635d2e41e29e9978adc9961087d4da4e60 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 25 Aug 2025 21:44:54 +0200 Subject: [PATCH] Cleaned up worker and orborus to point to url properly --- functions/onprem/orborus/orborus.go | 2 +- functions/onprem/worker/worker.go | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index 1eee1411..cb02b199 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -1109,7 +1109,7 @@ func deployK8sWorker(image string, identifier string, env []string) error { //env = append(env, fmt.Sprintf("SHUFFLE_SWARM_CONFIG=%s", swarmConfig)) env = append(env, fmt.Sprintf("BASE_URL=%s", baseUrl)) - env = append(env, fmt.Sprintf("SHUFFLE_SWARM_CONFIG=run") + env = append(env, fmt.Sprintf("SHUFFLE_SWARM_CONFIG=run")) env = append(env, fmt.Sprintf("WORKER_HOSTNAME=%s", "shuffle-workers")) if len(kubernetesNamespace) == 0 { diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go index a038c4ca..3be11b04 100644 --- a/functions/onprem/worker/worker.go +++ b/functions/onprem/worker/worker.go @@ -1444,8 +1444,15 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) { if isKubernetes == "true" { // Map it to: // /baseimagename/: - if len(localRegistry) > 0 && len(os.Getenv("SHUFFLE_BASE_IMAGE_REGISTRY")) > 0 { - imageName = fmt.Sprintf("%s/%s/%s:%s", os.Getenv("SHUFFLE_BASE_IMAGE_REGISTRY"), baseimagename, parsedAppname, action.AppVersion) + localRegistry := os.Getenv("REGISTRY_URL") + if len(localRegistry) > 0 && len(baseimagename) > 0 { + + newImageName := fmt.Sprintf("%s/%s/%s:%s", localRegistry, baseimagename, parsedAppname, action.AppVersion) + + log.Printf("[INFO] Remapping image name %s to %s due to registry+image name existing on k8s", imageName, newImageName) + + imageName = newImageName + } }