CD plugin: move CDI edit gen into computeDomainDaemonSettings

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

Author: jgehrcke

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

@@ -154,29 +154,29 @@ func (m *ComputeDomainManager) GetComputeDomainChannelContainerEdits(devRoot str
 	}
 }
 
-// GetComputeDomainDaemonContainerEdits() returns the CDI spec edits always
-// required for launching the CD Daemon (whether or not it tries to launch an
-// IMEX daemon internally).
-func (m *ComputeDomainManager) GetComputeDomainDaemonContainerEdits(ctx context.Context, domainID string) (*cdiapi.ContainerEdits, error) {
-	cd, err := m.GetComputeDomain(ctx, domainID)
+// GetCommonCDIContainerEdits() returns the CDI spec edits always required for
+// launching the CD Daemon (whether or not it tries to launch an IMEX daemon
+// internally).
+func (s *ComputeDomainDaemonSettings) GetCommonCDIContainerEdits(ctx context.Context) (*cdiapi.ContainerEdits, error) {
+	cd, err := s.manager.GetComputeDomain(ctx, s.domainID)
 	if err != nil {
-		return nil, fmt.Errorf("error getting compute domain %s: %w", domainID, err)
+		return nil, fmt.Errorf("error getting compute domain %s: %w", s.domainID, err)
 	}
 	if cd == nil {
-		return nil, fmt.Errorf("compute domain not found: %s", domainID)
+		return nil, fmt.Errorf("compute domain not found: %s", s.domainID)
 	}
 
 	edits := &cdiapi.ContainerEdits{
 		ContainerEdits: &cdispec.ContainerEdits{
 			Mounts: []*cdispec.Mount{
 				{
 					ContainerPath: "/etc/nvidia-imex",
-					HostPath:      fmt.Sprintf("%s/%s", m.configFilesRoot, domainID),
+					HostPath:      s.rootDir,
 					Options:       []string{"rw", "nosuid", "nodev", "bind"},
 				},
 			},
 			Env: []string{
-				fmt.Sprintf("CLIQUE_ID=%s", m.cliqueID),
+				fmt.Sprintf("CLIQUE_ID=%s", s.manager.cliqueID),
 				fmt.Sprintf("COMPUTE_DOMAIN_UUID=%s", cd.UID),
 				fmt.Sprintf("COMPUTE_DOMAIN_NAME=%s", cd.Name),
 				fmt.Sprintf("COMPUTE_DOMAIN_NAMESPACE=%s", cd.Namespace),

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

@@ -492,14 +492,6 @@ func (s *DeviceState) applyComputeDomainDaemonConfig(ctx context.Context, config
 		ComputeDomain: config.DomainID,
 	}
 
-	// Always inject CD config details into the CD daemon (regardless of clique
-	// ID being empty or not).
-	edits, err := s.computeDomainManager.GetComputeDomainDaemonContainerEdits(ctx, config.DomainID)
-	if err != nil {
-		return nil, fmt.Errorf("error preparing ComputeDomain daemon settings: %w", err)
-	}
-	configState.containerEdits = configState.containerEdits.Append(edits)
-
 	// Create new ComputeDomain daemon settings from the ComputeDomainManager.
 	computeDomainDaemonSettings := s.computeDomainManager.NewSettings(config.DomainID)
 
@@ -512,6 +504,14 @@ func (s *DeviceState) applyComputeDomainDaemonConfig(ctx context.Context, config
 		return nil, fmt.Errorf("error preparing ComputeDomain daemon settings for requests '%v' in claim '%v': %w", requests, claim.UID, err)
 	}
 
+	// Always inject CD config details into the CD daemon (regardless of clique
+	// ID being empty or not).
+	edits, err := computeDomainDaemonSettings.GetCommonCDIContainerEdits(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error getting common container edits for ComputeDomain daemon '%s': %w", config.DomainID, err)
+	}
+	configState.containerEdits = configState.containerEdits.Append(edits)
+
 	// 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).