remove extra prefix from CRs

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go

@@ -401,7 +401,7 @@ func (t CRDRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (gen
 		Decorator:               generic.UndecoratedStorage,
 		EnableGarbageCollection: t.EnableGarbageCollection,
 		DeleteCollectionWorkers: t.DeleteCollectionWorkers,
-		ResourcePrefix:          t.StoragePrefix + "/" + resource.Group + "/" + resource.Resource,
+		ResourcePrefix:          resource.Group + "/" + resource.Resource,
 	}
 	if t.EnableWatchCache {
 		ret.Decorator = genericregistry.StorageWithCacher(t.DefaultWatchCacheSize)

staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go

@@ -382,7 +382,7 @@ func TestEtcdStorage(t *testing.T) {
 		expectedObject *metaObject
 	}{
 		"namespacedNoxuDefinition": {
-			etcdPath: path.Join("/", etcdPrefix, "apiextensions.k8s.io/customresourcedefinitions/noxus.mygroup.example.com"), // TODO: Double check this, no namespace?
+			etcdPath: path.Join("/", etcdPrefix, "apiextensions.k8s.io/customresourcedefinitions/noxus.mygroup.example.com"),
 			expectedObject: &metaObject{
 				Kind:       "CustomResourceDefinition",
 				APIVersion: "apiextensions.k8s.io/v1beta1",
@@ -394,7 +394,7 @@ func TestEtcdStorage(t *testing.T) {
 			},
 		},
 		"namespacedNoxuInstance": {
-			etcdPath: path.Join("/", etcdPrefix, "mygroup.example.com/noxus/the-cruel-default/foo"),
+			etcdPath: "mygroup.example.com/noxus/the-cruel-default/foo",
 			expectedObject: &metaObject{
 				Kind:       "WishIHadChosenNoxu",
 				APIVersion: "mygroup.example.com/v1beta1",
@@ -420,7 +420,7 @@ func TestEtcdStorage(t *testing.T) {
 		},
 
 		"clusteredCurletInstance": {
-			etcdPath: path.Join("/", etcdPrefix, "mygroup.example.com/curlets/bar"),
+			etcdPath: "mygroup.example.com/curlets/bar",
 			expectedObject: &metaObject{
 				Kind:       "Curlet",
 				APIVersion: "mygroup.example.com/v1beta1",