squash: review feedback

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

Author: jgehrcke

cmd/compute-domain-daemon/computedomain.go

@@ -259,8 +259,7 @@ func (m *ComputeDomainManager) UpdateComputeDomainNodeInfo(ctx context.Context,
 			Name:     m.config.nodeName,
 			CliqueID: m.config.cliqueID,
 			Index:    nextIndex,
-			// Initialize as NotReady (will be updated by podmanager).
-			Status: nvapi.ComputeDomainStatusNotReady,
+			Status:   nvapi.ComputeDomainStatusNotReady,
 		}
 
 		klog.Infof("CD status does not contain node name '%s' yet, try to insert myself: %v", m.config.nodeName, nodeInfo)

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

@@ -154,13 +154,38 @@ 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)
+	if err != nil {
+		return nil, fmt.Errorf("error getting compute domain %s: %w", domainID, err)
+	}
+	if cd == nil {
+		return nil, fmt.Errorf("compute domain not found: %s", domainID)
+	}
+
+	edits := &cdiapi.ContainerEdits{
+		ContainerEdits: &cdispec.ContainerEdits{
+			Env: []string{
+				fmt.Sprintf("CLIQUE_ID=%s", m.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),
+			},
+		},
+	}
+	return edits, nil
 }
 
-func (s *ComputeDomainDaemonSettings) GetCDIContainerEdits(ctx context.Context, devRoot string, info *nvcapDeviceInfo) (*cdiapi.ContainerEdits, error) {
 func (s *ComputeDomainDaemonSettings) GetDomainID() string {
 	return s.domainID
 }
 
+// GetCDIContainerEditsForImex() returns the CDI spec edits only required for
+// 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{
@@ -181,7 +206,7 @@ func (s *ComputeDomainDaemonSettings) GetDomainID() string {
 			},
 		},
 	}
-	return edits, nil
+	return edits
 }
 
 func (s *ComputeDomainDaemonSettings) Prepare(ctx context.Context) error {

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

@@ -30,7 +30,6 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	cdiapi "tags.cncf.io/container-device-interface/pkg/cdi"
-	cdispec "tags.cncf.io/container-device-interface/specs-go"
 
 	configapi "github.com/NVIDIA/k8s-dra-driver-gpu/api/nvidia.com/resource/v1beta1"
 	"github.com/NVIDIA/k8s-dra-driver-gpu/pkg/featuregates"
@@ -492,26 +491,12 @@ func (s *DeviceState) applyComputeDomainDaemonConfig(ctx context.Context, config
 		ComputeDomain: config.DomainID,
 	}
 
-	cd, err := s.computeDomainManager.GetComputeDomain(ctx, config.DomainID)
+	// Always inject CD details into the CD daemon, in a heterogeneous CD clique
+	// ID below may be empty (while other CD details are set, and consumed by
+	// the CD daemon).
+	edits, err := s.computeDomainManager.GetComputeDomainDaemonContainerEdits(ctx, config.DomainID)
 	if err != nil {
-		return nil, fmt.Errorf("error getting compute domain: %w", err)
-	}
-	if cd == nil {
-		return nil, fmt.Errorf("compute domain not found: %s", config.DomainID)
-	}
-
-	// Always inject Compute Domain details into the CD daemon, in a
-	// heterogeneous CD clique ID below may be empty (while other CD details are
-	// set, and consumed by the CD daemon).
-	edits := &cdiapi.ContainerEdits{
-		ContainerEdits: &cdispec.ContainerEdits{
-			Env: []string{
-				fmt.Sprintf("CLIQUE_ID=%s", s.computeDomainManager.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),
-			},
-		},
+		return nil, fmt.Errorf("error preparing ComputeDomain daemon settings: %w", err)
 	}
 	configState.containerEdits = configState.containerEdits.Append(edits)
 
@@ -532,10 +517,7 @@ func (s *DeviceState) applyComputeDomainDaemonConfig(ctx context.Context, config
 		}
 
 		// Store information about the ComputeDomain daemon in the configState.
-		edits, err := computeDomainDaemonSettings.GetCDIContainerEdits(ctx, s.cdi.devRoot, nvcapDeviceInfo)
-		if err != nil {
-			return nil, fmt.Errorf("error getting container edits for ComputeDomain daemon for requests '%v' in claim '%v': %w", requests, claim.UID, err)
-		}
+		edits := computeDomainDaemonSettings.GetCDIContainerEditsForImex(ctx, s.cdi.devRoot, nvcapDeviceInfo)
 		configState.containerEdits = configState.containerEdits.Append(edits)
 	}