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

Fix multiple conversion tests

Browse Source
This commit is contained in:
wojtekt
2020-04-08 20:23:22 +02:00
parent 8c1f9616cf
commit f624314f91
8 changed files with 13 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/daemon/daemon_controller_test.go
View File

@@ -41,7 +41,6 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/flowcontrol"
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api/legacyscheme"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/scheduling"
@@ -248,9 +247,7 @@ func (f *fakePodControl) CreatePodsOnNode(nodeName, namespace string, template *
},
}
if err := legacyscheme.Scheme.Convert(&template.Spec, &pod.Spec, nil); err != nil {
return fmt.Errorf("unable to convert pod template: %v", err)
}
template.Spec.DeepCopyInto(&pod.Spec)
if len(nodeName) != 0 {
pod.Spec.NodeName = nodeName
}
@@ -282,9 +279,7 @@ func (f *fakePodControl) CreatePodsWithControllerRef(namespace string, template
pod.Name = names.SimpleNameGenerator.GenerateName(fmt.Sprintf("%p-", pod))
if err := legacyscheme.Scheme.Convert(&template.Spec, &pod.Spec, nil); err != nil {
return fmt.Errorf("unable to convert pod template: %v", err)
}
template.Spec.DeepCopyInto(&pod.Spec)
f.podStore.Update(pod)
f.podIDMap[pod.Name] = pod