github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert() should accept the new conversion Context value

Browse Source 
Allows Convert() to reuse the same conversions as ConvertToVersion
without being overly coupled to the version.
This commit is contained in:
Clayton Coleman
2016-07-04 16:13:27 -04:00
parent a7a7fd4631
commit 5f8366aac3
25 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/controller_utils.go
View File

@@ -458,7 +458,7 @@ func GetPodFromTemplate(template *api.PodTemplateSpec, parentObject runtime.Obje
if controllerRef != nil {
pod.OwnerReferences = append(pod.OwnerReferences, *controllerRef)
}
if err := api.Scheme.Convert(&template.Spec, &pod.Spec); err != nil {
if err := api.Scheme.Convert(&template.Spec, &pod.Spec, nil); err != nil {
return nil, fmt.Errorf("unable to convert pod template: %v", err)
}
return pod, nil