Refactor pkg/kubelet/config
This commit is contained in:
@@ -138,16 +138,12 @@ func extractFromFile(filename string) (pod api.Pod, err error) {
|
||||
return pod, err
|
||||
}
|
||||
|
||||
parsed, _, pod, manifestErr := tryDecodeSingleManifest(data)
|
||||
parsed, _, pod, manifestErr := tryDecodeSingleManifest(data, filename, true)
|
||||
if parsed {
|
||||
if manifestErr != nil {
|
||||
// It parsed but could not be used.
|
||||
return pod, manifestErr
|
||||
}
|
||||
// It parsed!
|
||||
if err = applyDefaults(&pod, filename, true); err != nil {
|
||||
return pod, err
|
||||
}
|
||||
return pod, nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user