Fix running jobs with custom docker_image when default job image is n…

…ot set Logic behind UseJobProxyFromImage is slightly broken. Keep it disabled for now.
ytsaurus · Apr 10, 2024 · 73f8a99 · 73f8a99
1 parent 847c46b
commit 73f8a99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/ytconfig/canondata/TestGetExecNodeConfigWithCri/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeConfigWithCri/test.canondata
@@ -117,7 +117,7 @@
                     namespace=yt;
                     "base_cgroup"="/yt";
                 };
-                "use_job_proxy_from_image"=%true;
+                "use_job_proxy_from_image"=%false;
             };
             "do_not_set_user_id"=%true;
         };

diff --git a/pkg/ytconfig/node.go b/pkg/ytconfig/node.go
@@ -378,12 +378,12 @@ func fillJobEnvironment(execNode *ExecNode, spec *ytv1.ExecNodesSpec, commonSpec
 
 		if jobImage := commonSpec.JobImage; jobImage != nil {
 			jobEnv.JobProxyImage = *jobImage
-			jobEnv.UseJobProxyFromImage = ptr.Bool(false)
 		} else {
 			jobEnv.JobProxyImage = ptr.StringDeref(spec.Image, commonSpec.CoreImage)
-			jobEnv.UseJobProxyFromImage = ptr.Bool(true)
 		}
 
+		jobEnv.UseJobProxyFromImage = ptr.Bool(false)
+
 		endpoint := "unix://" + getContainerdSocketPath(spec)
 
 		jobEnv.CriExecutor = &CriExecutor{