Skip to content

Adding dra-kubelet communication volumes #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubernetes-prow merged 1 commit into from
Jun 29, 2026
+127 −13
Merged

Adding dra-kubelet communication volumes #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions internal/controllers/device_plugin_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,8 @@ func (dsci *daemonSetCreatorImpl) setDevicePluginAsDesired(
Finalizers: []string{constants.NodeLabelerFinalizer},
},
Spec: v1.PodSpec{
InitContainers: generatePodContainerSpec(mod.Spec.DevicePlugin.InitContainer, "device-plugin-init", nil),
Containers: generatePodContainerSpec(&mod.Spec.DevicePlugin.Container, "device-plugin", containerVolumeMounts),
InitContainers: generatePodContainerSpec(mod.Spec.DevicePlugin.InitContainer, "device-plugin-init", nil, nil, nil),
Containers: generatePodContainerSpec(&mod.Spec.DevicePlugin.Container, "device-plugin", containerVolumeMounts, nil, nil),
PriorityClassName: "system-node-critical",
ImagePullSecrets: getPodPullSecrets(mod.Spec.ImageRepoSecret),
NodeSelector: nodeSelector,
Expand All @@ -470,21 +470,28 @@ func (dsci *daemonSetCreatorImpl) setDevicePluginAsDesired(
return controllerutil.SetControllerReference(mod, ds, dsci.scheme)
}

func generatePodContainerSpec(containerSpec *kmmv1beta1.DevicePluginContainerSpec, containerName string, presetVolumeMounts []v1.VolumeMount) []v1.Container {
func generatePodContainerSpec(
containerSpec *kmmv1beta1.DevicePluginContainerSpec,
containerName string,
presetVolumeMounts []v1.VolumeMount,
presetEnv []v1.EnvVar,
livenessProbe *v1.Probe,
) []v1.Container {
if containerSpec == nil {
return nil
}
return []v1.Container{
{
Args: containerSpec.Args,
Command: containerSpec.Command,
Env: containerSpec.Env,
Env: append(presetEnv, containerSpec.Env...),
Name: containerName,
Image: containerSpec.Image,
ImagePullPolicy: containerSpec.ImagePullPolicy,
Resources: containerSpec.Resources,
SecurityContext: &v1.SecurityContext{Privileged: ptr.To(true)},
VolumeMounts: append(containerSpec.VolumeMounts, presetVolumeMounts...),
VolumeMounts: append(presetVolumeMounts, containerSpec.VolumeMounts...),
LivenessProbe: livenessProbe,
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/device_plugin_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,11 +907,11 @@ var _ = Describe("DevicePluginReconciler_setDevicePluginAsDesired", func() {
Privileged: ptr.To(true),
},
VolumeMounts: []v1.VolumeMount{
dpVolMount,
{
Name: "kubelet-device-plugins",
MountPath: "/var/lib/kubelet/device-plugins",
},
dpVolMount,
},
},
},
Expand Down
67 changes: 64 additions & 3 deletions internal/controllers/dra_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -48,6 +49,10 @@ const (
kubeletPluginsPath = "/var/lib/kubelet/plugins/"
kubeletPluginsRegistryVolumeName = "kubelet-plugins-registry"
kubeletPluginsRegistryPath = "/var/lib/kubelet/plugins_registry/"
cdiVolumeName = "cdi"
cdiPath = "/var/run/cdi"

draHealthcheckPort = 51515
)

type DRAReconciler struct {
Expand Down Expand Up @@ -438,9 +443,64 @@ func (dsci *draDaemonSetCreatorImpl) setDRAAsDesired(
},
}

cdiVolume := v1.Volume{
Name: cdiVolumeName,
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{
Path: cdiPath,
Type: &hostPathDirOrCreate,
},
},
}

containerVolumeMounts := []v1.VolumeMount{
{Name: kubeletPluginsVolumeName, MountPath: kubeletPluginsPath},
{Name: kubeletPluginsRegistryVolumeName, MountPath: kubeletPluginsRegistryPath},
{Name: cdiVolumeName, MountPath: cdiPath},

@ybettan ybettan Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the CDI volume mount override the user mounts unlike the ENV variables that allows the user to override the pre-set variables. Is this by design? Shouldn't we have a consistent behavior?

@yevgeny-shnaidman yevgeny-shnaidman Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they don't override user mount. See line 503

@yevgeny-shnaidman yevgeny-shnaidman Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed the order, so that user's volume's definition will take precedence

}

presetEnv := []v1.EnvVar{
{
Name: "NODE_NAME",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{FieldPath: "spec.nodeName"},
},
},
{
Name: "POD_UID",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{FieldPath: "metadata.uid"},
},
},
{
Name: "CDI_ROOT",
Value: cdiPath,
},
{
Name: "KUBELET_REGISTRAR_DIRECTORY_PATH",
Value: kubeletPluginsRegistryPath,
},
{
Name: "KUBELET_PLUGINS_DIRECTORY_PATH",
Value: kubeletPluginsPath,
},
{
Name: "HEALTHCHECK_PORT",
Value: fmt.Sprintf("%d", draHealthcheckPort),

@ybettan ybettan Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if 2 DRA pods lands on the same node and both bind the 51515 port? One of them will probably fail isn't it?

@yevgeny-shnaidman yevgeny-shnaidman Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dra pods are deployed by daemonset, so 2 pods cannot land on the same node

},
}

draLivenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{
Port: draHealthcheckPort,
Service: ptr.To("liveness"),
},
},
InitialDelaySeconds: 30,
PeriodSeconds: 10,
TimeoutSeconds: 5,
FailureThreshold: 3,
}

standardLabels := map[string]string{
Expand Down Expand Up @@ -470,13 +530,14 @@ func (dsci *draDaemonSetCreatorImpl) setDRAAsDesired(
Finalizers: []string{constants.NodeLabelerFinalizer},
},
Spec: v1.PodSpec{
InitContainers: generatePodContainerSpec(mod.Spec.DRA.InitContainer, "dra-init", nil),
Containers: generatePodContainerSpec(&mod.Spec.DRA.Container, "dra", containerVolumeMounts),
InitContainers: generatePodContainerSpec(mod.Spec.DRA.InitContainer, "dra-init", nil, nil, nil),
Containers: generatePodContainerSpec(&mod.Spec.DRA.Container, "dra", containerVolumeMounts, presetEnv, draLivenessProbe),
PriorityClassName: "system-node-critical",
HostNetwork: true,
ImagePullSecrets: getPodPullSecrets(mod.Spec.ImageRepoSecret),
NodeSelector: nodeSelector,
ServiceAccountName: mod.Spec.DRA.ServiceAccountName,
Volumes: append([]v1.Volume{pluginsVolume, registryVolume}, mod.Spec.DRA.Volumes...),
Volumes: append([]v1.Volume{pluginsVolume, registryVolume, cdiVolume}, mod.Spec.DRA.Volumes...),
Tolerations: mod.Spec.Tolerations,
AutomountServiceAccountToken: mod.Spec.DRA.AutomountServiceAccountToken,
},
Expand Down
54 changes: 50 additions & 4 deletions internal/controllers/dra_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,11 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {

err := dsc.setDRAAsDesired(context.Background(), &ds, &mod)
Expect(err).NotTo(HaveOccurred())
Expect(ds.Spec.Template.Spec.Volumes).To(HaveLen(3))
Expect(ds.Spec.Template.Spec.Volumes).To(HaveLen(4))
Expect(ds.Spec.Template.Spec.Volumes[0].Name).To(Equal("kubelet-plugins"))
Expect(ds.Spec.Template.Spec.Volumes[1].Name).To(Equal("kubelet-plugins-registry"))
Expect(ds.Spec.Template.Spec.Volumes[2]).To(Equal(vol))
Expect(ds.Spec.Template.Spec.Volumes[2].Name).To(Equal("cdi"))
Expect(ds.Spec.Template.Spec.Volumes[3]).To(Equal(vol))
})

DescribeTable("should work as expected",
Expand Down Expand Up @@ -614,6 +615,25 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
hostPathDirOrCreate := v1.HostPathDirectoryOrCreate
hostPathDir := v1.HostPathDirectory

presetEnv := []v1.EnvVar{
{
Name: "NODE_NAME",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{FieldPath: "spec.nodeName"},
},
},
{
Name: "POD_UID",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{FieldPath: "metadata.uid"},
},
},
{Name: "CDI_ROOT", Value: "/var/run/cdi"},
{Name: "KUBELET_REGISTRAR_DIRECTORY_PATH", Value: "/var/lib/kubelet/plugins_registry/"},
{Name: "KUBELET_PLUGINS_DIRECTORY_PATH", Value: "/var/lib/kubelet/plugins/"},
{Name: "HEALTHCHECK_PORT", Value: "51515"},
}

expected := appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{
Name: dsName,
Expand Down Expand Up @@ -643,7 +663,7 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
{
Args: args,
Command: command,
Env: env,
Env: append(presetEnv, env...),
Image: draImage,
ImagePullPolicy: ipp,
Name: "dra",
Expand All @@ -652,7 +672,6 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
Privileged: ptr.To(true),
},
VolumeMounts: []v1.VolumeMount{
draVolMount,
{
Name: "kubelet-plugins",
MountPath: "/var/lib/kubelet/plugins/",
Expand All @@ -661,6 +680,23 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
Name: "kubelet-plugins-registry",
MountPath: "/var/lib/kubelet/plugins_registry/",
},
{
Name: "cdi",
MountPath: "/var/run/cdi",
},
draVolMount,
},
LivenessProbe: &v1.Probe{
ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{
Port: 51515,
Service: ptr.To("liveness"),
},
},
InitialDelaySeconds: 30,
PeriodSeconds: 10,
TimeoutSeconds: 5,
FailureThreshold: 3,
},
},
},
Expand All @@ -669,6 +705,7 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
utils.GetKernelModuleReadyNodeLabel(namespace, draModuleName): "",
},
PriorityClassName: "system-node-critical",
HostNetwork: true,
ServiceAccountName: serviceAccountName,
Volumes: []v1.Volume{
{
Expand All @@ -689,6 +726,15 @@ var _ = Describe("DRAReconciler_setDRAAsDesired", func() {
},
},
},
{
Name: "cdi",
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{
Path: "/var/run/cdi",
Type: &hostPathDirOrCreate,
},
},
},
draVol,
},
Tolerations: []v1.Toleration{testToleration},
Expand Down
Loading