Using existing env var to confirm CDI is enabled

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>

Author: visheshtanksale

cmd/compute-domain-daemon/main.go

@@ -204,10 +204,11 @@ func newApp() *cli.App {
 
 // Run invokes the IMEX daemon and manages its lifecycle.
 func run(ctx context.Context, cancel context.CancelFunc, flags *Flags) error {
-	// Verify that CDI container edits were applied by the container runtime.
-	// If the env var is not set to "true", CDI is likely disabled and the daemon
-	// cannot function correctly (e.g. the /imexd mount will be missing).
-	if os.Getenv(common.CDIEditsAppliedEnvKey) != common.CDIEditsAppliedEnvValue {
+	// Verify that CDI container edits were applied by the container runtime by
+	// checking for COMPUTE_DOMAIN_UUID, which is always injected as part of the
+	// CDI edits. If it is missing, CDI is likely disabled and the daemon cannot
+	// function correctly (e.g. the /imexd mount will be missing).
+	if flags.computeDomainUUID == "" {
 		return fmt.Errorf("CDI container edits did not apply -- is CDI enabled in your container runtime?")
 	}
 

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

@@ -162,7 +162,6 @@ func (s *ComputeDomainDaemonSettings) GetCDIContainerEditsCommon(ctx context.Con
 	edits := &cdiapi.ContainerEdits{
 		ContainerEdits: &cdispec.ContainerEdits{
 			Env: []string{
-				fmt.Sprintf("%s=%s", common.CDIEditsAppliedEnvKey, common.CDIEditsAppliedEnvValue),
 				fmt.Sprintf("CLIQUE_ID=%s", s.manager.cliqueID),
 				fmt.Sprintf("COMPUTE_DOMAIN_UUID=%s", cd.UID),
 				fmt.Sprintf("COMPUTE_DOMAIN_NAME=%s", cd.Name),

internal/common/util.go

@@ -29,15 +29,6 @@ import (
 
 const dumpPath = "/tmp/goroutine-stacks.dump"
 
-// CDIEditsAppliedEnvKey and CDIEditsAppliedEnvValue is a key/value
-// pair injected via CDI container edits into the CD daemon container. The CD
-// daemon checks for this key/value pair at startup to verify that CDI edits were
-// applied by the container runtime. If not present, CDI is likely disabled.
-const (
-	CDIEditsAppliedEnvKey   = "NVIDIA_CDI_EDITS_APPLIED"
-	CDIEditsAppliedEnvValue = "true"
-)
-
 // Set up SIGUSR2 handler: if triggered, acquire stack traces for all goroutines
 // in this process. Dump to file, and fall back to emitting to stderr if file
 // output didn't work.