diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index d3775e0760c..1ca0df20cc8 100644 --- a/pkg/api/copy_test.go +++ b/pkg/api/copy_test.go @@ -50,12 +50,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer) t.Fatalf("Could not create a %v: %s", kind, err) } f.Fuzz(item) - itemCopy, err := api.Scheme.DeepCopy(item) - if err != nil { - t.Errorf("Could not deep copy a %v: %s", kind, err) - return - } - + itemCopy := item.DeepCopyObject() if !reflect.DeepEqual(item, itemCopy) { t.Errorf("\nexpected: %#v\n\ngot: %#v\n\ndiff: %v", item, itemCopy, diff.ObjectReflectDiff(item, itemCopy)) } diff --git a/pkg/api/deep_copy_test.go b/pkg/api/deep_copy_test.go index e4c730210e1..d88b6bb5ee7 100644 --- a/pkg/api/deep_copy_test.go +++ b/pkg/api/deep_copy_test.go @@ -131,11 +131,7 @@ var benchmarkPod api.Pod = api.Pod{ func BenchmarkPodCopy(b *testing.B) { var result *api.Pod for i := 0; i < b.N; i++ { - obj, err := api.Scheme.DeepCopy(&benchmarkPod) - if err != nil { - b.Fatalf("Unexpected error copying pod: %v", err) - } - result = obj.(*api.Pod) + result = benchmarkPod.DeepCopy() } if !apiequality.Semantic.DeepEqual(benchmarkPod, *result) { b.Fatalf("Incorrect copy: expected %v, got %v", benchmarkPod, *result) @@ -154,11 +150,7 @@ func BenchmarkNodeCopy(b *testing.B) { var result *api.Node for i := 0; i < b.N; i++ { - obj, err := api.Scheme.DeepCopy(&node) - if err != nil { - b.Fatalf("Unexpected error copying node: %v", err) - } - result = obj.(*api.Node) + result = node.DeepCopy() } if !apiequality.Semantic.DeepEqual(node, *result) { b.Fatalf("Incorrect copy: expected %v, got %v", node, *result) @@ -177,11 +169,7 @@ func BenchmarkReplicationControllerCopy(b *testing.B) { var result *api.ReplicationController for i := 0; i < b.N; i++ { - obj, err := api.Scheme.DeepCopy(&replicationController) - if err != nil { - b.Fatalf("Unexpected error copying replication controller: %v", err) - } - result = obj.(*api.ReplicationController) + result = replicationController.DeepCopy() } if !apiequality.Semantic.DeepEqual(replicationController, *result) { b.Fatalf("Incorrect copy: expected %v, got %v", replicationController, *result) diff --git a/pkg/api/defaulting_test.go b/pkg/api/defaulting_test.go index 40c04f6f9b8..0350a19926c 100644 --- a/pkg/api/defaulting_test.go +++ b/pkg/api/defaulting_test.go @@ -187,13 +187,10 @@ func TestDefaulting(t *testing.T) { src.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{}) - original, err := scheme.DeepCopy(src) - if err != nil { - t.Fatal(err) - } + original := src.DeepCopyObject() // get internal - withDefaults, _ := scheme.DeepCopy(src) + withDefaults := src.DeepCopyObject() scheme.Default(withDefaults.(runtime.Object)) if !reflect.DeepEqual(original, withDefaults) { diff --git a/pkg/api/v1/resource/helpers.go b/pkg/api/v1/resource/helpers.go index e0610daae3c..ad10fc16b7b 100644 --- a/pkg/api/v1/resource/helpers.go +++ b/pkg/api/v1/resource/helpers.go @@ -123,15 +123,7 @@ func ExtractResourceValueByContainerNameAndNodeAllocatable(copier deepCopier, fs return "", err } - containerCopy, err := copier.DeepCopy(realContainer) - if err != nil { - return "", fmt.Errorf("failed to perform a deep copy of container object: %v", err) - } - - container, ok := containerCopy.(*v1.Container) - if !ok { - return "", fmt.Errorf("unexpected type returned from deep copy of container object") - } + container := realContainer.DeepCopy() MergeContainerResourceLimits(container, nodeAllocatable)