Skip to content

Commit f624314

Browse files
committed
Fix multiple conversion tests
1 parent 8c1f961 commit f624314

File tree

8 files changed

+13
-612
lines changed

8 files changed

+13
-612
lines changed

pkg/controller/daemon/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ go_test(
6060
],
6161
embed = [":go_default_library"],
6262
deps = [
63-
"//pkg/api/legacyscheme:go_default_library",
6463
"//pkg/api/v1/pod:go_default_library",
6564
"//pkg/apis/core:go_default_library",
6665
"//pkg/apis/scheduling:go_default_library",

pkg/controller/daemon/daemon_controller_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import (
4141
"k8s.io/client-go/tools/record"
4242
"k8s.io/client-go/util/flowcontrol"
4343
"k8s.io/client-go/util/workqueue"
44-
"k8s.io/kubernetes/pkg/api/legacyscheme"
4544
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
4645
api "k8s.io/kubernetes/pkg/apis/core"
4746
"k8s.io/kubernetes/pkg/apis/scheduling"
@@ -248,9 +247,7 @@ func (f *fakePodControl) CreatePodsOnNode(nodeName, namespace string, template *
248247
},
249248
}
250249

251-
if err := legacyscheme.Scheme.Convert(&template.Spec, &pod.Spec, nil); err != nil {
252-
return fmt.Errorf("unable to convert pod template: %v", err)
253-
}
250+
template.Spec.DeepCopyInto(&pod.Spec)
254251
if len(nodeName) != 0 {
255252
pod.Spec.NodeName = nodeName
256253
}
@@ -282,9 +279,7 @@ func (f *fakePodControl) CreatePodsWithControllerRef(namespace string, template
282279

283280
pod.Name = names.SimpleNameGenerator.GenerateName(fmt.Sprintf("%p-", pod))
284281

285-
if err := legacyscheme.Scheme.Convert(&template.Spec, &pod.Spec, nil); err != nil {
286-
return fmt.Errorf("unable to convert pod template: %v", err)
287-
}
282+
template.Spec.DeepCopyInto(&pod.Spec)
288283

289284
f.podStore.Update(pod)
290285
f.podIDMap[pod.Name] = pod

staging/src/k8s.io/apimachinery/pkg/conversion/BUILD

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ go_test(
1313
"helper_test.go",
1414
],
1515
embed = [":go_default_library"],
16-
deps = [
17-
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
18-
"//vendor/github.com/google/gofuzz:go_default_library",
19-
"//vendor/github.com/spf13/pflag:go_default_library",
20-
],
16+
deps = ["//vendor/github.com/spf13/pflag:go_default_library"],
2117
)
2218

2319
go_library(

0 commit comments

Comments
 (0)