Merge pull request #115 from CormickKneey/fork

samuelkarp · web-flow · commit 44ecabb65300 · 2024-10-23T11:00:08.000-07:00
device-injector: remove unreachable code.
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)
 	}

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,6 @@ func (p plugin) CreateContainer(_ context.Context, pod api.PodSandbox, ctr *ap`
`88`	`88`	`return nil, nil, err`
`89`	`89`	`}`
`90`	`90`
`91`		`- return adjust, nil, nil`
`92`		`-`
`93`	`91`	`if verbose {`
`94`	`92`	`dump(containerName(pod, ctr), "ContainerAdjustment", adjust)`
`95`	`93`	`}`
`@@ -132,10 +130,6 @@ func parseDevices(ctr string, annotations map[string]string) ([]device, error) {`
`132`	`130`	`return nil, nil`
`133`	`131`	`}`
`134`	`132`
`135`		`- if annotation == nil {`
`136`		`- return nil, nil`
`137`		`- }`
`138`		`-`
`139`	`133`	`if err := yaml.Unmarshal(annotation, &devices); err != nil {`
`140`	`134`	`return nil, fmt.Errorf("invalid device annotation %q: %w", string(annotation), err)`
`141`	`135`	`}`