Add into exec node pods environment variables for CRI tools (#283)

ytsaurus · Jun 17, 2024 · b3cca0a · b3cca0a
1 parent 021b907
commit b3cca0a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pkg/components/exec_node_base.go b/pkg/components/exec_node_base.go
@@ -73,6 +73,10 @@ func (n *baseExecNode) doBuildBase() error {
 	}
 	setContainerPrivileged(&podSpec.Containers[0])
 
+	if envSpec := n.spec.JobEnvironment; envSpec != nil && envSpec.CRI != nil {
+		n.addEnvironmentForCRITools(&podSpec.Containers[0])
+	}
+
 	for i := range podSpec.InitContainers {
 		setContainerPrivileged(&podSpec.InitContainers[i])
 	}
@@ -107,6 +111,15 @@ func (n *baseExecNode) doBuildBase() error {
 	return nil
 }
 
+func (n *baseExecNode) addEnvironmentForCRITools(container *corev1.Container) {
+	socketPath := ytconfig.GetContainerdSocketPath(n.spec)
+	container.Env = append(container.Env, []corev1.EnvVar{
+		{Name: "CONTAINERD_ADDRESS", Value: socketPath},                     // ctr
+		{Name: "CONTAINERD_NAMESPACE", Value: "k8s.io"},                     // ctr
+		{Name: "CONTAINER_RUNTIME_ENDPOINT", Value: "unix://" + socketPath}, // crictl
+	}...)
+}
+
 func (n *baseExecNode) doBuildCRISidecar(envSpec *ytv1.JobEnvironmentSpec, podSpec *corev1.PodSpec) {
 	configPath := path.Join(consts.ContainerdConfigMountPoint, consts.ContainerdConfigFileName)
 
@@ -128,6 +141,8 @@ func (n *baseExecNode) doBuildCRISidecar(envSpec *ytv1.JobEnvironmentSpec, podSp
 		},
 	}
 
+	n.addEnvironmentForCRITools(&jobsContainer)
+
 	jobsContainer.VolumeMounts = append(jobsContainer.VolumeMounts,
 		corev1.VolumeMount{
 			Name:      consts.ContainerdConfigVolumeName,

diff --git a/pkg/ytconfig/cri.go b/pkg/ytconfig/cri.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ytsaurus/yt-k8s-operator/pkg/consts"
 )
 
-func getContainerdSocketPath(spec *ytv1.ExecNodesSpec) string {
+func GetContainerdSocketPath(spec *ytv1.ExecNodesSpec) string {
 	if location := ytv1.FindFirstLocation(spec.Locations, ytv1.LocationTypeImageCache); location != nil {
 		return path.Join(location.Path, consts.ContainerdSocketName)
 	}
@@ -30,7 +30,7 @@ func (g *NodeGenerator) GetContainerdConfig(spec *ytv1.ExecNodesSpec) ([]byte, e
 		"root":    rootPath,
 
 		"grpc": map[string]any{
-			"address": getContainerdSocketPath(spec),
+			"address": GetContainerdSocketPath(spec),
 			"uid":     0,
 			"gid":     0,
 		},

diff --git a/pkg/ytconfig/node.go b/pkg/ytconfig/node.go
@@ -402,7 +402,7 @@ func fillJobEnvironment(execNode *ExecNode, spec *ytv1.ExecNodesSpec, commonSpec
 
 		jobEnv.UseJobProxyFromImage = ptr.Bool(false)
 
-		endpoint := "unix://" + getContainerdSocketPath(spec)
+		endpoint := "unix://" + GetContainerdSocketPath(spec)
 
 		jobEnv.CriExecutor = &CriExecutor{
 			RuntimeEndpoint: endpoint,