Merge pull request #51544 from sttts/sttts-deepcopy-pkg-api

Automatic merge from submit-queue (batch tested with PRs 51228, 50185, 50940, 51544, 51543)

pkg/api: simplify deepcopy calls

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)
+	itemCopy := item.DeepCopyObject()
-	if err != nil {
-		t.Errorf("Could not deep copy a %v: %s", kind, err)
-		return
-	}
-
 	if !reflect.DeepEqual(item, itemCopy) {
 		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, diff.ObjectReflectDiff(item, itemCopy))
 	}

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)
+		result = benchmarkPod.DeepCopy()
-		if err != nil {
-			b.Fatalf("Unexpected error copying pod: %v", err)
-		}
-		result = obj.(*api.Pod)
 	}
 	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)
+		result = node.DeepCopy()
-		if err != nil {
-			b.Fatalf("Unexpected error copying node: %v", err)
-		}
-		result = obj.(*api.Node)
 	}
 	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)
+		result = replicationController.DeepCopy()
-		if err != nil {
-			b.Fatalf("Unexpected error copying replication controller: %v", err)
-		}
-		result = obj.(*api.ReplicationController)
 	}
 	if !apiequality.Semantic.DeepEqual(replicationController, *result) {
 		b.Fatalf("Incorrect copy: expected %v, got %v", replicationController, *result)

pkg/api/defaulting_test.go

@@ -187,13 +187,10 @@ func TestDefaulting(t *testing.T) {
 
 			src.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
 
-			original, err := scheme.DeepCopy(src)
+			original := src.DeepCopyObject()
-			if err != nil {
-				t.Fatal(err)
-			}
 
 			// get internal
-			withDefaults, _ := scheme.DeepCopy(src)
+			withDefaults := src.DeepCopyObject()
 			scheme.Default(withDefaults.(runtime.Object))
 
 			if !reflect.DeepEqual(original, withDefaults) {

pkg/api/v1/resource/helpers.go

@@ -123,15 +123,7 @@ func ExtractResourceValueByContainerNameAndNodeAllocatable(copier deepCopier, fs
 		return "", err
 	}
 
-	containerCopy, err := copier.DeepCopy(realContainer)
+	container := realContainer.DeepCopy()
-	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")
-	}
 
 	MergeContainerResourceLimits(container, nodeAllocatable)