CD daemon: always mount in IMEX daemon config files

Signed-off-by: Dr. Jan-Philip Gehrcke <[email protected]>

CD plugin: always prepare IMEX config on the host and mount it in

Signed-off-by: Dr. Jan-Philip Gehrcke <[email protected]>

Author: jgehrcke

cmd/compute-domain-kubelet-plugin/computedomain.go

@@ -168,6 +168,13 @@ func (m *ComputeDomainManager) GetComputeDomainDaemonContainerEdits(ctx context.
 
 	edits := &cdiapi.ContainerEdits{
 		ContainerEdits: &cdispec.ContainerEdits{
+			Mounts: []*cdispec.Mount{
+				{
+					ContainerPath: "/etc/nvidia-imex",
+					HostPath:      fmt.Sprintf("%s/%s", m.configFilesRoot, domainID),
+					Options:       []string{"rw", "nosuid", "nodev", "bind"},
+				},
+			},
 			Env: []string{
 				fmt.Sprintf("CLIQUE_ID=%s", m.cliqueID),
 				fmt.Sprintf("COMPUTE_DOMAIN_UUID=%s", cd.UID),
@@ -184,17 +191,10 @@ func (s *ComputeDomainDaemonSettings) GetDomainID() string {
 }
 
 // GetCDIContainerEditsForImex() returns the CDI spec edits only required for
-// launching the CD Daemon when it actually wraps an IMEX daemon.
+// launching the CD daemon when it actually wraps an IMEX daemon.
 func (s *ComputeDomainDaemonSettings) GetCDIContainerEditsForImex(ctx context.Context, devRoot string, info *nvcapDeviceInfo) *cdiapi.ContainerEdits {
 	edits := &cdiapi.ContainerEdits{
 		ContainerEdits: &cdispec.ContainerEdits{
-			Mounts: []*cdispec.Mount{
-				{
-					ContainerPath: "/etc/nvidia-imex",
-					HostPath:      s.rootDir,
-					Options:       []string{"rw", "nosuid", "nodev", "bind"},
-				},
-			},
 			DeviceNodes: []*cdispec.DeviceNode{
 				{
 					Path:     info.path,

cmd/compute-domain-kubelet-plugin/device_state.go

@@ -500,23 +500,27 @@ func (s *DeviceState) applyComputeDomainDaemonConfig(ctx context.Context, config
 	}
 	configState.containerEdits = configState.containerEdits.Append(edits)
 
-	// Only prepare files to inject to the daemon if IMEX is supported.
+	// Create new ComputeDomain daemon settings from the ComputeDomainManager.
+	computeDomainDaemonSettings := s.computeDomainManager.NewSettings(config.DomainID)
+
+	// Prepare injecting IMEX daemon config files even if IMEX is not supported.
+	// This for example creates
+	// '/var/lib/kubelet/plugins/compute-domain.nvidia.com/domains/<uid>' on the
+	// host which is used as mount source mapped to /etc/nvidia-imex in the CD
+	// daemon container.
+	if err := computeDomainDaemonSettings.Prepare(ctx); err != nil {
+		return nil, fmt.Errorf("error preparing ComputeDomain daemon settings for requests '%v' in claim '%v': %w", requests, claim.UID, err)
+	}
+
+	// Only inject dev nodes related to
+	// /proc/driver/nvidia/capabilities/fabric-imex-mgmt if IMEX is supported
+	// (if we want to start the IMEX daemon process in the CD daemon pod).
 	if s.computeDomainManager.cliqueID != "" {
 		// Parse the device node info for the fabric-imex-mgmt nvcap.
 		nvcapDeviceInfo, err := s.nvdevlib.parseNVCapDeviceInfo(nvidiaCapFabricImexMgmtPath)
 		if err != nil {
 			return nil, fmt.Errorf("error parsing nvcap device info for fabric-imex-mgmt: %w", err)
 		}
-
-		// Create new ComputeDomain daemon settings from the ComputeDomainManager.
-		computeDomainDaemonSettings := s.computeDomainManager.NewSettings(config.DomainID)
-
-		// Prepare the new ComputeDomain daemon.
-		if err := computeDomainDaemonSettings.Prepare(ctx); err != nil {
-			return nil, fmt.Errorf("error preparing ComputeDomain daemon settings for requests '%v' in claim '%v': %w", requests, claim.UID, err)
-		}
-
-		// Store information about the ComputeDomain daemon in the configState.
 		edits := computeDomainDaemonSettings.GetCDIContainerEditsForImex(ctx, s.cdi.devRoot, nvcapDeviceInfo)
 		configState.containerEdits = configState.containerEdits.Append(edits)
 	}