Merge pull request #36709 from hongchaodeng/e3

Automatic merge from submit-queue (batch tested with PRs 35300, 36709, 37643, 37813, 37697)

[etcd] test cleanup: remove unnecessary AddPrefix()

What?
Remove etcdtest.AddPrefix() in tests. They will be automatically prepended in etcd storage.

Why?
ref: #36290 #36374
After the change, it will double prepend.

pkg/registry/core/namespace/etcd/BUILD

@@ -41,7 +41,6 @@ go_test(
         "//pkg/labels:go_default_library",
         "//pkg/registry/generic:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
-        "//pkg/storage/etcd/etcdtest:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
     ],
 )

pkg/registry/core/namespace/etcd/etcd_test.go

@@ -25,7 +25,6 @@ import (
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
 	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
 )
 
@@ -141,7 +140,7 @@ func TestDeleteNamespaceWithIncompleteFinalizers(t *testing.T) {
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
-	key := etcdtest.AddPrefix("namespaces/foo")
+	key := "namespaces/foo"
 	ctx := api.NewContext()
 	now := unversioned.Now()
 	namespace := &api.Namespace{
@@ -166,7 +165,7 @@ func TestDeleteNamespaceWithCompleteFinalizers(t *testing.T) {
 	storage, server := newStorage(t)
 	defer server.Terminate(t)
 	defer storage.Store.DestroyFunc()
-	key := etcdtest.AddPrefix("namespaces/foo")
+	key := "namespaces/foo"
 	ctx := api.NewContext()
 	now := unversioned.Now()
 	namespace := &api.Namespace{