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

Merge pull request #1791 from PROCYDE/fix-k8s-logs-disabled

Browse Source 
Pass SHUFFLE_LOGS_DISABLED env var from orborus -> worker -> app in Kubernetes
This commit is contained in:
Frikky
2025-08-20 16:26:03 +02:00
committed by GitHub
parent 0bf0736d07 feaee08333
commit d3519cd164
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+20 -17
View File
@@ -734,7 +734,7 @@ func deployServiceWorkers(image string) {
var updatedNetworks []swarm.NetworkAttachmentConfig var updatedNetworks []swarm.NetworkAttachmentConfig
for _, net := range serviceSpec.Networks { for _, net := range serviceSpec.Networks {
if net.Target != "shuffle_shuffle" { if net.Target != "shuffle_shuffle" {
updatedNetworks = append(updatedNetworks, net) updatedNetworks = append(updatedNetworks, net)
} }
} }
serviceSpec.Networks = updatedNetworks serviceSpec.Networks = updatedNetworks
@@ -813,21 +813,21 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
newImages = append(newImages, curimage) newImages = append(newImages, curimage)
// Force remove the current image to avoid cached layers // Force remove the current image to avoid cached layers
// if swarmConfig == "run" || swarmConfig == "swarm" { // if swarmConfig == "run" || swarmConfig == "swarm" {
// _, err := dockercli.ImageRemove(ctx, curimage, image.RemoveOptions{ // _, err := dockercli.ImageRemove(ctx, curimage, image.RemoveOptions{
// Force: true, // Force: true,
// PruneChildren: true, // PruneChildren: true,
// }) // })
//
// if err != nil { // if err != nil {
// log.Printf("[ERROR] Failed removing image for re-download: %s", err) // log.Printf("[ERROR] Failed removing image for re-download: %s", err)
// } else { // } else {
// log.Printf("[DEBUG] Removed image: %s", curimage) // log.Printf("[DEBUG] Removed image: %s", curimage)
// } // }
// } else { // } else {
// //log.Printf("[DEBUG] Skipping image removal for %s as swarmConfig is not set to run or swarm. Value: %#v", curimage, swarmConfig) // //log.Printf("[DEBUG] Skipping image removal for %s as swarmConfig is not set to run or swarm. Value: %#v", curimage, swarmConfig)
// } // }
//
err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage) err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage)
if err != nil { if err != nil {
//log.Printf("[ERROR] Failed downloading image: %s", err) //log.Printf("[ERROR] Failed downloading image: %s", err)
@@ -1065,6 +1065,10 @@ func deployK8sWorker(image string, identifier string, env []string) error {
env = append(env, fmt.Sprintf("SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT=%s", appContainerSecurityContext)) env = append(env, fmt.Sprintf("SHUFFLE_APP_CONTAINER_SECURITY_CONTEXT=%s", appContainerSecurityContext))
} }
if len(os.Getenv("SHUFFLE_LOGS_DISABLED")) > 0 {
env = append(env, fmt.Sprintf("SHUFFLE_LOGS_DISABLED=%s", os.Getenv("SHUFFLE_LOGS_DISABLED")))
}
clientset, _, err := shuffle.GetKubernetesClient() clientset, _, err := shuffle.GetKubernetesClient()
if err != nil { if err != nil {
log.Printf("[ERROR] Error getting kubernetes client:", err) log.Printf("[ERROR] Error getting kubernetes client:", err)
@@ -2214,7 +2218,6 @@ func main() {
log.Printf("[INFO] Waiting for executions at %s with Environment %#v", fullUrl, environment) log.Printf("[INFO] Waiting for executions at %s with Environment %#v", fullUrl, environment)
hasStarted := false hasStarted := false
for { for {
if req.Method == "POST" { if req.Method == "POST" {
functions/onprem/worker/worker.go
+4
View File
@@ -422,6 +422,10 @@ func deployk8sApp(image string, identifier string, env []string) error {
envMap["SHUFFLE_SWARM_CONFIG"] = os.Getenv("SHUFFLE_SWARM_CONFIG") envMap["SHUFFLE_SWARM_CONFIG"] = os.Getenv("SHUFFLE_SWARM_CONFIG")
envMap["BASE_URL"] = "http://shuffle-workers:33333" envMap["BASE_URL"] = "http://shuffle-workers:33333"
if len(os.Getenv("SHUFFLE_LOGS_DISABLED")) > 0 {
envMap["SHUFFLE_LOGS_DISABLED"] = os.Getenv("SHUFFLE_LOGS_DISABLED")
}
clientset, _, err := shuffle.GetKubernetesClient() clientset, _, err := shuffle.GetKubernetesClient()
if err != nil { if err != nil {
log.Printf("[ERROR] Failed getting kubernetes: %s", err) log.Printf("[ERROR] Failed getting kubernetes: %s", err)