cri/nri: short-circuit nil adjustment.

klihub · k8s-infra-cherrypick-robot · commit 05ccbb3a7eb1 · 2025-12-11T16:57:45.000Z
Skip processing early if we get a nil adjustment from NRI.

Signed-off-by: Krisztian Litkey &lt;krisztian.litkey@intel.com&gt;
diff --git a/internal/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go
@@ -336,6 +336,9 @@ func (a *API) WithContainerAdjustment() containerd.NewContainerOpts {
 		if err != nil {
 			return fmt.Errorf("failed to get NRI adjustment for container: %w", err)
 		}
+		if adjust == nil {
+			return nil
+		}
 
 		sgen := generate.Generator{Config: spec}
 		ngen := nrigen.SpecGenerator(&sgen, generatorOptions...)

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,9 @@ func (a *API) WithContainerAdjustment() containerd.NewContainerOpts {`
`336`	`336`	`if err != nil {`
`337`	`337`	`return fmt.Errorf("failed to get NRI adjustment for container: %w", err)`
`338`	`338`	`}`
	`339`	`+ if adjust == nil {`
	`340`	`+ return nil`
	`341`	`+ }`
`339`	`342`
`340`	`343`	`sgen := generate.Generator{Config: spec}`
`341`	`344`	`ngen := nrigen.SpecGenerator(&sgen, generatorOptions...)`