Refactor pkg/kubelet/config

This commit is contained in:
Wojciech Tyczynski
2015-03-23 10:29:46 +01:00
parent ef758881d1
commit b395c40e19
3 changed files with 15 additions and 19 deletions

View File

@@ -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
}