diff --git a/plugin/pkg/admission/podpreset/admission_test.go b/plugin/pkg/admission/podpreset/admission_test.go index 4caa3d6bf82..bede2f6ca26 100644 --- a/plugin/pkg/admission/podpreset/admission_test.go +++ b/plugin/pkg/admission/podpreset/admission_test.go @@ -729,12 +729,8 @@ func TestExclusionNoAdmit(t *testing.T) { }, }, } - originalPod, err := api.Scheme.Copy(pod) - if err != nil { - t.Fatal(err) - } - - err = admitPod(pod, pip) + originalPod := pod.DeepCopy() + err := admitPod(pod, pip) if err != nil { t.Fatal(err) } @@ -797,12 +793,8 @@ func TestAdmitEmptyPodNamespace(t *testing.T) { }, }, } - originalPod, err := api.Scheme.Copy(pod) - if err != nil { - t.Fatal(err) - } - - err = admitPod(pod, pip) + originalPod := pod.DeepCopy() + err := admitPod(pod, pip) if err != nil { t.Fatal(err) } diff --git a/plugin/pkg/admission/resourcequota/controller.go b/plugin/pkg/admission/resourcequota/controller.go index 84f196ba60d..689ed4d1773 100644 --- a/plugin/pkg/admission/resourcequota/controller.go +++ b/plugin/pkg/admission/resourcequota/controller.go @@ -320,11 +320,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib func copyQuotas(in []api.ResourceQuota) ([]api.ResourceQuota, error) { out := make([]api.ResourceQuota, 0, len(in)) for _, quota := range in { - copied, err := api.Scheme.Copy("a) - if err != nil { - return nil, err - } - out = append(out, *copied.(*api.ResourceQuota)) + out = append(out, *quota.DeepCopy()) } return out, nil diff --git a/plugin/pkg/admission/storageclass/setdefault/admission_test.go b/plugin/pkg/admission/storageclass/setdefault/admission_test.go index 487ae7f3d1c..e0516eaf131 100644 --- a/plugin/pkg/admission/storageclass/setdefault/admission_test.go +++ b/plugin/pkg/admission/storageclass/setdefault/admission_test.go @@ -191,11 +191,7 @@ func TestAdmission(t *testing.T) { glog.V(4).Infof("starting test %q", test.name) // clone the claim, it's going to be modified - clone, err := api.Scheme.DeepCopy(test.claim) - if err != nil { - t.Fatalf("Cannot clone claim: %v", err) - } - claim := clone.(*api.PersistentVolumeClaim) + claim := test.claim.DeepCopy() ctrl := newPlugin() informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) @@ -214,7 +210,7 @@ func TestAdmission(t *testing.T) { admission.Create, nil, // userInfo ) - err = ctrl.Admit(attrs) + err := ctrl.Admit(attrs) glog.Infof("Got %v", err) if err != nil && !test.expectError { t.Errorf("Test %q: unexpected error received: %v", test.name, err)