marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up worker and orborus to point to url properly

Browse Source
This commit is contained in:
Frikky
2025-08-25 21:44:54 +02:00
parent dc26803866
commit ca68f4635d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+1 -1
View File
@@ -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("SHUFFLE_SWARM_CONFIG=%s", swarmConfig))
env = append(env, fmt.Sprintf("BASE_URL=%s", baseUrl)) 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")) env = append(env, fmt.Sprintf("WORKER_HOSTNAME=%s", "shuffle-workers"))
if len(kubernetesNamespace) == 0 { if len(kubernetesNamespace) == 0 {
functions/onprem/worker/worker.go
+9 -2
View File
@@ -1444,8 +1444,15 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
if isKubernetes == "true" { if isKubernetes == "true" {
// Map it to: // Map it to:
// <registry>/baseimagename/<appname>:<appversion> // <registry>/baseimagename/<appname>:<appversion>
if len(localRegistry) > 0 && len(os.Getenv("SHUFFLE_BASE_IMAGE_REGISTRY")) > 0 { localRegistry := os.Getenv("REGISTRY_URL")
imageName = fmt.Sprintf("%s/%s/%s:%s", os.Getenv("SHUFFLE_BASE_IMAGE_REGISTRY"), baseimagename, parsedAppname, action.AppVersion) 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
} }
} }