Merge pull request containerd#115 from CormickKneey/fork

device-injector: remove unreachable code.
samuelkarp · Oct 23, 2024 · 44ecabb · 44ecabb
2 parents 229236e + 235aa11
commit 44ecabb
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/plugins/device-injector/device-injector.go b/plugins/device-injector/device-injector.go
@@ -88,8 +88,6 @@ func (p *plugin) CreateContainer(_ context.Context, pod *api.PodSandbox, ctr *ap
 		return nil, nil, err
 	}
 
-	return adjust, nil, nil
-
 	if verbose {
 		dump(containerName(pod, ctr), "ContainerAdjustment", adjust)
 	}
@@ -132,10 +130,6 @@ func parseDevices(ctr string, annotations map[string]string) ([]device, error) {
 		return nil, nil
 	}
 
-	if annotation == nil {
-		return nil, nil
-	}
-
 	if err := yaml.Unmarshal(annotation, &devices); err != nil {
 		return nil, fmt.Errorf("invalid device annotation %q: %w", string(annotation), err)
 	}