From 83d07ebb7208060dca22cd2d6f924b57c2463841 Mon Sep 17 00:00:00 2001 From: iifiigii Date: Sat, 9 Nov 2024 00:58:26 +0800 Subject: [PATCH 1/2] FIX:docker client leaking FDs --- backend/go-app/docker.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go index 9906f3b7..a6dfc67d 100755 --- a/backend/go-app/docker.go +++ b/backend/go-app/docker.go @@ -211,6 +211,7 @@ func fixTags(tags []string) []string { func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder string, downloadIfFail bool) error { ctx := context.Background() client, err := client.NewEnvClient() + defer client.Close() if err != nil { log.Printf("Unable to create docker client: %s", err) return err @@ -476,6 +477,7 @@ func buildImage(tags []string, dockerfileLocation string) error { ctx := context.Background() client, err := client.NewEnvClient() + defer client.Close() if err != nil { log.Printf("Unable to create docker client: %s", err) return err From 6506400f32a9d4cbe376cc7e72202aac8c6ebe3e Mon Sep 17 00:00:00 2001 From: Aditya <60684641+0x0elliot@users.noreply.github.com> Date: Mon, 11 Nov 2024 02:06:44 +0700 Subject: [PATCH 2/2] fix: typo in env name! --- functions/onprem/orborus/go.sum | 4 ++-- functions/onprem/orborus/orborus.go | 4 ++-- functions/onprem/worker/worker.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/functions/onprem/orborus/go.sum b/functions/onprem/orborus/go.sum index f67e436b..bb5d861a 100644 --- a/functions/onprem/orborus/go.sum +++ b/functions/onprem/orborus/go.sum @@ -301,8 +301,8 @@ github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fc github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shuffle/shuffle-shared v0.6.74 h1:os3BDSFZnl4U8ZgsTAY8IsTDADcMXhbc1rS9UMa0BIY= -github.com/shuffle/shuffle-shared v0.6.74/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus= +github.com/shuffle/shuffle-shared v0.6.79 h1:MIy5kcShHYN05ov/50YJ+la1C2v1rL8IENapOvX9I8U= +github.com/shuffle/shuffle-shared v0.6.79/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index ae9c1fbc..12fcd0b4 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -966,8 +966,8 @@ func deployK8sWorker(image string, identifier string, env []string) error { env = append(env, fmt.Sprintf("REGISTRY_URL=%s", os.Getenv("REGISTRY_URL"))) } - if len(os.Getenv("SHUFFLE_USE_GCHR_OVERRIDE_FOR_AUTODEPLOY")) > 0 { - env = append(env, fmt.Sprintf("SHUFFLE_USE_GCHR_OVERRIDE_FOR_AUTODEPLOY=%s", os.Getenv("SHUFFLE_USE_GCHR_OVERRIDE_FOR_AUTODEPLOY"))) + if len(os.Getenv("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY")) > 0 { + env = append(env, fmt.Sprintf("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY=%s", os.Getenv("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY"))) } clientset, _, err := shuffle.GetKubernetesClient() diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go index a05de7fc..6dd24679 100644 --- a/functions/onprem/worker/worker.go +++ b/functions/onprem/worker/worker.go @@ -433,12 +433,12 @@ func deployk8sApp(image string, identifier string, env []string) error { } } - autoDeployOverride := os.Getenv("SHUFFLE_USE_GCHR_OVERRIDE_FOR_AUTODEPLOY") == "true" + autoDeployOverride := os.Getenv("SHUFFLE_USE_GHCR_OVERRIDE_FOR_AUTODEPLOY") == "true" localRegistry := "" // Checking if app is generated or not - if !baseDeployMode && !autoDeployOverride { + if !(baseDeployMode && autoDeployOverride) { localRegistry = os.Getenv("REGISTRY_URL") } else { log.Printf("[DEBUG] Detected baseDeploy image (%s) and ghcr override. Resorting to using ghcr instead of registry", image)