Prefer runtime options for PluginInfo request

jfernandez · k8s-infra-cherrypick-robot · commit 569af34cbb76 · 2025-02-27T07:37:01.000Z
Previously, PluginInfo was called with task options as the primary value, resulting in opts.BinaryName being omitted. Consequently, the containerd-shim-runc-v2 fell back to the system's runc binary in the PATH rather than the explicitly specified one. This change inverts the option fallback by preferring runtime options over task options, ensuring the correct binary is used for the PluginInfo request. Closes: #11169 Signed-off-by: Jose Fernandez <josef@netflix.com> Reviewed-by: Erikson Tung <etung@netflix.com>
diff --git a/core/runtime/v2/task_manager.go b/core/runtime/v2/task_manager.go
@@ -266,12 +266,12 @@ func (m *TaskManager) validateRuntimeFeatures(ctx context.Context, opts runtime.
 		return nil
 	}
 
-	topts := opts.TaskOptions
-	if topts == nil || topts.GetValue() == nil {
-		topts = opts.RuntimeOptions
+	ropts := opts.RuntimeOptions
+	if ropts == nil || ropts.GetValue() == nil {
+		ropts = opts.TaskOptions
 	}
 
-	pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(topts)})
+	pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(ropts)})
 	if err != nil {
 		return fmt.Errorf("runtime info: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -266,12 +266,12 @@ func (m *TaskManager) validateRuntimeFeatures(ctx context.Context, opts runtime.`
`266`	`266`	`return nil`
`267`	`267`	`}`
`268`	`268`
`269`		`- topts := opts.TaskOptions`
`270`		`- if topts == nil \|\| topts.GetValue() == nil {`
`271`		`- topts = opts.RuntimeOptions`
	`269`	`+ ropts := opts.RuntimeOptions`
	`270`	`+ if ropts == nil \|\| ropts.GetValue() == nil {`
	`271`	`+ ropts = opts.TaskOptions`
`272`	`272`	`}`
`273`	`273`
`274`		`- pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(topts)})`
	`274`	`+ pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(ropts)})`
`275`	`275`	`if err != nil {`
`276`	`276`	`return fmt.Errorf("runtime info: %w", err)`
`277`	`277`	`}`