Merge branch 'pks-objectpool-drop-unlink-repository' into 'master'

objectpool: Drop UnlinkRepostioryFromObjectPool RPC

See merge request gitlab-org/gitaly!4037

12 files changed, 178 insertions, 614 deletions

diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go
index edbd9228e..80a4dae60 100644
--- a/internal/git/objectpool/link.go
+++ b/internal/git/objectpool/link.go
@@ -2,7 +2,6 @@ package objectpool
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -161,23 +160,3 @@ func (o *ObjectPool) LinkedToRepository(repo *gitalypb.Repository) (bool, error)
 
 	return false, nil
 }
-
-// Unlink removes the remote from the object pool
-func (o *ObjectPool) Unlink(ctx context.Context, repo *gitalypb.Repository) error {
-	if !o.Exists() {
-		return errors.New("pool does not exist")
-	}
-
-	remote := o.poolRepo.Remote()
-
-	// We need to use removeRemote, and can't leverage `git config --remove-section`
-	// as the latter doesn't clean up refs
-	remoteName := repo.GetGlRepository()
-	if err := remote.Remove(ctx, remoteName); err != nil {
-		if present, err2 := remote.Exists(ctx, remoteName); err2 != nil || present {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/internal/git/objectpool/link_test.go b/internal/git/objectpool/link_test.go
index 99f4e9346..3a45adb37 100644
--- a/internal/git/objectpool/link_test.go
+++ b/internal/git/objectpool/link_test.go
@@ -122,23 +122,6 @@ func listBitmaps(t *testing.T, repoPath string) []string {
 	return bitmaps
 }
 
-func TestUnlink(t *testing.T) {
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	pool, testRepo := setupObjectPool(t)
-
-	require.Error(t, pool.Unlink(ctx, testRepo), "removing a non-existing pool should be an error")
-
-	require.NoError(t, pool.Create(ctx, testRepo), "create pool")
-	require.NoError(t, pool.Link(ctx, testRepo), "link test repo to pool")
-
-	require.False(t, gittest.RemoteExists(t, pool.cfg, pool.FullPath(), testRepo.GetGlRepository()), "pool remotes should include %v", testRepo)
-
-	require.NoError(t, pool.Unlink(ctx, testRepo), "unlink repo")
-	require.False(t, gittest.RemoteExists(t, pool.cfg, pool.FullPath(), testRepo.GetGlRepository()), "pool remotes should no longer include %v", testRepo)
-}
-
 func TestLinkAbsoluteLinkExists(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
diff --git a/internal/gitaly/service/objectpool/link.go b/internal/gitaly/service/objectpool/link.go
index d323c08cd..691cd8764 100644
--- a/internal/gitaly/service/objectpool/link.go
+++ b/internal/gitaly/service/objectpool/link.go
@@ -2,8 +2,6 @@ package objectpool
 
 import (
 	"context"
-	"errors"
-	"fmt"
 
 	"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
@@ -31,24 +29,3 @@ func (s *server) LinkRepositoryToObjectPool(ctx context.Context, req *gitalypb.L
 
 	return &gitalypb.LinkRepositoryToObjectPoolResponse{}, nil
 }
-
-func (s *server) UnlinkRepositoryFromObjectPool(ctx context.Context, req *gitalypb.UnlinkRepositoryFromObjectPoolRequest) (*gitalypb.UnlinkRepositoryFromObjectPoolResponse, error) {
-	if req.GetRepository() == nil {
-		return nil, helper.ErrInvalidArgument(errors.New("no repository"))
-	}
-
-	pool, err := s.poolForRequest(req)
-	if err != nil {
-		return nil, helper.ErrInternal(err)
-	}
-
-	if !pool.Exists() {
-		return nil, helper.ErrNotFound(fmt.Errorf("pool repository not found: %s", pool.FullPath()))
-	}
-
-	if err := pool.Unlink(ctx, req.GetRepository()); err != nil {
-		return nil, helper.ErrInternal(err)
-	}
-
-	return &gitalypb.UnlinkRepositoryFromObjectPoolResponse{}, nil
-}
diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go
index 5ae22a8b5..da434e12d 100644
--- a/internal/gitaly/service/objectpool/link_test.go
+++ b/internal/gitaly/service/objectpool/link_test.go
@@ -155,127 +155,3 @@ func TestLinkNoPool(t *testing.T) {
 
 	assert.True(t, storage.IsGitDirectory(poolRepoPath))
 }
-
-func TestUnlink(t *testing.T) {
-	cfg, repo, _, _, client := setup(t, testserver.WithDisablePraefect())
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	deletedRepo, deletedRepoPath := gittest.CloneRepo(t, cfg, cfg.Storages[0])
-
-	pool := initObjectPool(t, cfg, cfg.Storages[0])
-	require.NoError(t, pool.Create(ctx, repo), "create pool")
-	require.NoError(t, pool.Link(ctx, repo))
-	require.NoError(t, pool.Link(ctx, deletedRepo))
-
-	require.NoError(t, os.RemoveAll(deletedRepoPath))
-	require.NoFileExists(t, deletedRepoPath)
-
-	pool2 := initObjectPool(t, cfg, cfg.Storages[0])
-	require.NoError(t, pool2.Create(ctx, repo), "create pool 2")
-
-	require.False(t, gittest.RemoteExists(t, cfg, pool.FullPath(), repo.GlRepository), "sanity check: remote exists in pool")
-	require.False(t, gittest.RemoteExists(t, cfg, pool.FullPath(), deletedRepo.GlRepository), "sanity check: remote exists in pool")
-
-	testCases := []struct {
-		desc string
-		req  *gitalypb.UnlinkRepositoryFromObjectPoolRequest
-		code codes.Code
-	}{
-		{
-			desc: "Successful request",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: repo,
-				ObjectPool: pool.ToProto(),
-			},
-			code: codes.OK,
-		},
-		{
-			desc: "Not linked in the first place",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: repo,
-				ObjectPool: pool2.ToProto(),
-			},
-			code: codes.OK,
-		},
-		{
-			desc: "No Repository",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: nil,
-				ObjectPool: pool.ToProto(),
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "No ObjectPool",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: repo,
-				ObjectPool: nil,
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "Repo not found",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: deletedRepo,
-				ObjectPool: pool.ToProto(),
-			},
-			code: codes.OK,
-		},
-		{
-			desc: "Pool not found",
-			req: &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-				Repository: repo,
-				ObjectPool: &gitalypb.ObjectPool{
-					Repository: &gitalypb.Repository{
-						StorageName:  repo.GetStorageName(),
-						RelativePath: gittest.NewObjectPoolName(t), // does not exist
-					},
-				},
-			},
-			code: codes.NotFound,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			//nolint:staticcheck
-			_, err := client.UnlinkRepositoryFromObjectPool(ctx, tc.req)
-
-			if tc.code != codes.OK {
-				testhelper.RequireGrpcError(t, err, tc.code)
-				return
-			}
-
-			require.NoError(t, err, "call UnlinkRepositoryFromObjectPool")
-
-			remoteName := tc.req.Repository.GlRepository
-			require.False(t, gittest.RemoteExists(t, cfg, pool.FullPath(), remoteName), "remote should no longer exist in pool")
-		})
-	}
-}
-
-func TestUnlinkIdempotent(t *testing.T) {
-	cfg, repo, _, _, client := setup(t)
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	pool := initObjectPool(t, cfg, cfg.Storages[0])
-	require.NoError(t, pool.Create(ctx, repo))
-	require.NoError(t, pool.Link(ctx, repo))
-
-	request := &gitalypb.UnlinkRepositoryFromObjectPoolRequest{
-		Repository: repo,
-		ObjectPool: pool.ToProto(),
-	}
-
-	//nolint:staticcheck
-	_, err := client.UnlinkRepositoryFromObjectPool(ctx, request)
-	require.NoError(t, err)
-
-	//nolint:staticcheck
-	_, err = client.UnlinkRepositoryFromObjectPool(ctx, request)
-	require.NoError(t, err)
-}
diff --git a/internal/gitaly/service/objectpool/reduplicate_test.go b/internal/gitaly/service/objectpool/reduplicate_test.go
index 5aca89311..b635a01ee 100644
--- a/internal/gitaly/service/objectpool/reduplicate_test.go
+++ b/internal/gitaly/service/objectpool/reduplicate_test.go
@@ -41,6 +41,6 @@ func TestReduplicate(t *testing.T) {
 	_, err = client.ReduplicateRepository(ctx, &gitalypb.ReduplicateRepositoryRequest{Repository: repo})
 	require.NoError(t, err)
 
-	require.NoError(t, pool.Unlink(ctx, repo))
+	require.NoError(t, os.RemoveAll(altPath))
 	gittest.Exec(t, cfg, "-C", repoPath, "cat-file", "-e", existingObjectID)
 }
diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go
index 98029fb41..5fb87808f 100644
--- a/internal/praefect/coordinator.go
+++ b/internal/praefect/coordinator.go
@@ -86,13 +86,12 @@ var transactionRPCs = map[string]transactionsCondition{
 
 	// The following RPCs currently aren't transactional, but we may consider making them
 	// transactional in the future if the need arises.
-	"/gitaly.ObjectPoolService/CreateObjectPool":               transactionsDisabled,
-	"/gitaly.ObjectPoolService/DeleteObjectPool":               transactionsDisabled,
-	"/gitaly.ObjectPoolService/DisconnectGitAlternates":        transactionsDisabled,
-	"/gitaly.ObjectPoolService/LinkRepositoryToObjectPool":     transactionsDisabled,
-	"/gitaly.ObjectPoolService/ReduplicateRepository":          transactionsDisabled,
-	"/gitaly.ObjectPoolService/UnlinkRepositoryFromObjectPool": transactionsDisabled,
-	"/gitaly.RepositoryService/RenameRepository":               transactionsDisabled,
+	"/gitaly.ObjectPoolService/CreateObjectPool":           transactionsDisabled,
+	"/gitaly.ObjectPoolService/DeleteObjectPool":           transactionsDisabled,
+	"/gitaly.ObjectPoolService/DisconnectGitAlternates":    transactionsDisabled,
+	"/gitaly.ObjectPoolService/LinkRepositoryToObjectPool": transactionsDisabled,
+	"/gitaly.ObjectPoolService/ReduplicateRepository":      transactionsDisabled,
+	"/gitaly.RepositoryService/RenameRepository":           transactionsDisabled,
 
 	// The following list of RPCs are considered idempotent RPCs: while they write into the
 	// target repository, this shouldn't ever have any user-visible impact given that they're
diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index dad50cc76..992b4c561 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -58,12 +58,11 @@ func TestNewProtoRegistry(t *testing.T) {
 			"NamespaceExists": protoregistry.OpAccessor,
 		},
 		"ObjectPoolService": {
-			"CreateObjectPool":               protoregistry.OpMutator,
-			"DeleteObjectPool":               protoregistry.OpMutator,
-			"LinkRepositoryToObjectPool":     protoregistry.OpMutator,
-			"UnlinkRepositoryFromObjectPool": protoregistry.OpMutator,
-			"ReduplicateRepository":          protoregistry.OpMutator,
-			"DisconnectGitAlternates":        protoregistry.OpMutator,
+			"CreateObjectPool":           protoregistry.OpMutator,
+			"DeleteObjectPool":           protoregistry.OpMutator,
+			"LinkRepositoryToObjectPool": protoregistry.OpMutator,
+			"ReduplicateRepository":      protoregistry.OpMutator,
+			"DisconnectGitAlternates":    protoregistry.OpMutator,
 		},
 		"OperationService": {
 			"UserCreateBranch":    protoregistry.OpMutator,
diff --git a/proto/go/gitalypb/objectpool.pb.go b/proto/go/gitalypb/objectpool.pb.go
index 582e65746..460cb87e8 100644
--- a/proto/go/gitalypb/objectpool.pb.go
+++ b/proto/go/gitalypb/objectpool.pb.go
@@ -295,101 +295,6 @@ func (*LinkRepositoryToObjectPoolResponse) Descriptor() ([]byte, []int) {
 	return file_objectpool_proto_rawDescGZIP(), []int{5}
 }
 
-// This RPC doesn't require the ObjectPool as it will remove the alternates file
-// from the pool participant. The caller is responsible no data loss occurs.
-type UnlinkRepositoryFromObjectPoolRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"` // already specified as the target repo field
-	ObjectPool *ObjectPool `protobuf:"bytes,2,opt,name=object_pool,json=objectPool,proto3" json:"object_pool,omitempty"`
-}
-
-func (x *UnlinkRepositoryFromObjectPoolRequest) Reset() {
-	*x = UnlinkRepositoryFromObjectPoolRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UnlinkRepositoryFromObjectPoolRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnlinkRepositoryFromObjectPoolRequest) ProtoMessage() {}
-
-func (x *UnlinkRepositoryFromObjectPoolRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnlinkRepositoryFromObjectPoolRequest.ProtoReflect.Descriptor instead.
-func (*UnlinkRepositoryFromObjectPoolRequest) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *UnlinkRepositoryFromObjectPoolRequest) GetRepository() *Repository {
-	if x != nil {
-		return x.Repository
-	}
-	return nil
-}
-
-func (x *UnlinkRepositoryFromObjectPoolRequest) GetObjectPool() *ObjectPool {
-	if x != nil {
-		return x.ObjectPool
-	}
-	return nil
-}
-
-type UnlinkRepositoryFromObjectPoolResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *UnlinkRepositoryFromObjectPoolResponse) Reset() {
-	*x = UnlinkRepositoryFromObjectPoolResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UnlinkRepositoryFromObjectPoolResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnlinkRepositoryFromObjectPoolResponse) ProtoMessage() {}
-
-func (x *UnlinkRepositoryFromObjectPoolResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnlinkRepositoryFromObjectPoolResponse.ProtoReflect.Descriptor instead.
-func (*UnlinkRepositoryFromObjectPoolResponse) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{7}
-}
-
 type ReduplicateRepositoryRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -401,7 +306,7 @@ type ReduplicateRepositoryRequest struct {
 func (x *ReduplicateRepositoryRequest) Reset() {
 	*x = ReduplicateRepositoryRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[8]
+		mi := &file_objectpool_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -414,7 +319,7 @@ func (x *ReduplicateRepositoryRequest) String() string {
 func (*ReduplicateRepositoryRequest) ProtoMessage() {}
 
 func (x *ReduplicateRepositoryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[8]
+	mi := &file_objectpool_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -427,7 +332,7 @@ func (x *ReduplicateRepositoryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReduplicateRepositoryRequest.ProtoReflect.Descriptor instead.
 func (*ReduplicateRepositoryRequest) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{8}
+	return file_objectpool_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ReduplicateRepositoryRequest) GetRepository() *Repository {
@@ -446,7 +351,7 @@ type ReduplicateRepositoryResponse struct {
 func (x *ReduplicateRepositoryResponse) Reset() {
 	*x = ReduplicateRepositoryResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[9]
+		mi := &file_objectpool_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -459,7 +364,7 @@ func (x *ReduplicateRepositoryResponse) String() string {
 func (*ReduplicateRepositoryResponse) ProtoMessage() {}
 
 func (x *ReduplicateRepositoryResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[9]
+	mi := &file_objectpool_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -472,7 +377,7 @@ func (x *ReduplicateRepositoryResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReduplicateRepositoryResponse.ProtoReflect.Descriptor instead.
 func (*ReduplicateRepositoryResponse) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{9}
+	return file_objectpool_proto_rawDescGZIP(), []int{7}
 }
 
 type DisconnectGitAlternatesRequest struct {
@@ -486,7 +391,7 @@ type DisconnectGitAlternatesRequest struct {
 func (x *DisconnectGitAlternatesRequest) Reset() {
 	*x = DisconnectGitAlternatesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[10]
+		mi := &file_objectpool_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -499,7 +404,7 @@ func (x *DisconnectGitAlternatesRequest) String() string {
 func (*DisconnectGitAlternatesRequest) ProtoMessage() {}
 
 func (x *DisconnectGitAlternatesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[10]
+	mi := &file_objectpool_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -512,7 +417,7 @@ func (x *DisconnectGitAlternatesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DisconnectGitAlternatesRequest.ProtoReflect.Descriptor instead.
 func (*DisconnectGitAlternatesRequest) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{10}
+	return file_objectpool_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *DisconnectGitAlternatesRequest) GetRepository() *Repository {
@@ -531,7 +436,7 @@ type DisconnectGitAlternatesResponse struct {
 func (x *DisconnectGitAlternatesResponse) Reset() {
 	*x = DisconnectGitAlternatesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[11]
+		mi := &file_objectpool_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -544,7 +449,7 @@ func (x *DisconnectGitAlternatesResponse) String() string {
 func (*DisconnectGitAlternatesResponse) ProtoMessage() {}
 
 func (x *DisconnectGitAlternatesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[11]
+	mi := &file_objectpool_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -557,7 +462,7 @@ func (x *DisconnectGitAlternatesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DisconnectGitAlternatesResponse.ProtoReflect.Descriptor instead.
 func (*DisconnectGitAlternatesResponse) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{11}
+	return file_objectpool_proto_rawDescGZIP(), []int{9}
 }
 
 type FetchIntoObjectPoolRequest struct {
@@ -573,7 +478,7 @@ type FetchIntoObjectPoolRequest struct {
 func (x *FetchIntoObjectPoolRequest) Reset() {
 	*x = FetchIntoObjectPoolRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[12]
+		mi := &file_objectpool_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -586,7 +491,7 @@ func (x *FetchIntoObjectPoolRequest) String() string {
 func (*FetchIntoObjectPoolRequest) ProtoMessage() {}
 
 func (x *FetchIntoObjectPoolRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[12]
+	mi := &file_objectpool_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -599,7 +504,7 @@ func (x *FetchIntoObjectPoolRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchIntoObjectPoolRequest.ProtoReflect.Descriptor instead.
 func (*FetchIntoObjectPoolRequest) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{12}
+	return file_objectpool_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *FetchIntoObjectPoolRequest) GetOrigin() *Repository {
@@ -632,7 +537,7 @@ type FetchIntoObjectPoolResponse struct {
 func (x *FetchIntoObjectPoolResponse) Reset() {
 	*x = FetchIntoObjectPoolResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[13]
+		mi := &file_objectpool_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -645,7 +550,7 @@ func (x *FetchIntoObjectPoolResponse) String() string {
 func (*FetchIntoObjectPoolResponse) ProtoMessage() {}
 
 func (x *FetchIntoObjectPoolResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[13]
+	mi := &file_objectpool_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -658,7 +563,7 @@ func (x *FetchIntoObjectPoolResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchIntoObjectPoolResponse.ProtoReflect.Descriptor instead.
 func (*FetchIntoObjectPoolResponse) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{13}
+	return file_objectpool_proto_rawDescGZIP(), []int{11}
 }
 
 type GetObjectPoolRequest struct {
@@ -672,7 +577,7 @@ type GetObjectPoolRequest struct {
 func (x *GetObjectPoolRequest) Reset() {
 	*x = GetObjectPoolRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[14]
+		mi := &file_objectpool_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -685,7 +590,7 @@ func (x *GetObjectPoolRequest) String() string {
 func (*GetObjectPoolRequest) ProtoMessage() {}
 
 func (x *GetObjectPoolRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[14]
+	mi := &file_objectpool_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -698,7 +603,7 @@ func (x *GetObjectPoolRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetObjectPoolRequest.ProtoReflect.Descriptor instead.
 func (*GetObjectPoolRequest) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{14}
+	return file_objectpool_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *GetObjectPoolRequest) GetRepository() *Repository {
@@ -719,7 +624,7 @@ type GetObjectPoolResponse struct {
 func (x *GetObjectPoolResponse) Reset() {
 	*x = GetObjectPoolResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_objectpool_proto_msgTypes[15]
+		mi := &file_objectpool_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -732,7 +637,7 @@ func (x *GetObjectPoolResponse) String() string {
 func (*GetObjectPoolResponse) ProtoMessage() {}
 
 func (x *GetObjectPoolResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_objectpool_proto_msgTypes[15]
+	mi := &file_objectpool_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -745,7 +650,7 @@ func (x *GetObjectPoolResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetObjectPoolResponse.ProtoReflect.Descriptor instead.
 func (*GetObjectPoolResponse) Descriptor() ([]byte, []int) {
-	return file_objectpool_proto_rawDescGZIP(), []int{15}
+	return file_objectpool_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *GetObjectPoolResponse) GetObjectPool() *ObjectPool {
@@ -790,117 +695,96 @@ var file_objectpool_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f,
 	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x24, 0x0a, 0x22, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65,
 	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-	0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9c, 0x01, 0x0a,
-	0x25, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72,
-	0x79, 0x46, 0x72, 0x6f, 0x6d, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74,
-	0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04,
-	0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79,
-	0x12, 0x39, 0x0a, 0x0b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4f,
-	0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x42, 0x04, 0xa0, 0xc6, 0x2c, 0x01, 0x52,
-	0x0a, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0x28, 0x0a, 0x26, 0x55,
-	0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x46,
-	0x72, 0x6f, 0x6d, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x58, 0x0a, 0x1c, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61,
-	0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98,
-	0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22,
-	0x1f, 0x0a, 0x1d, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x5a, 0x0a, 0x1e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69,
-	0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e,
-	0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01,
-	0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x21, 0x0a, 0x1f,
-	0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xa1, 0x01, 0x0a, 0x1a, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a,
-	0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30,
-	0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
-	0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f,
-	0x72, 0x79, 0x42, 0x04, 0xa0, 0xc6, 0x2c, 0x01, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
-	0x12, 0x39, 0x0a, 0x0b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4f,
-	0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52,
-	0x0a, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x65, 0x70, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70,
-	0x61, 0x63, 0x6b, 0x22, 0x1d, 0x0a, 0x1b, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f,
+	0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x58, 0x0a, 0x1c,
+	0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a,
+	0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69,
+	0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x1f, 0x0a, 0x1d, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5a, 0x0a, 0x1e, 0x44, 0x69, 0x73, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70,
+	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72,
+	0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x22, 0x21, 0x0a, 0x1f, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x1a, 0x46, 0x65, 0x74, 0x63, 0x68,
+	0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52,
+	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0xa0, 0xc6, 0x2c, 0x01, 0x52,
+	0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x39, 0x0a, 0x0b, 0x6f, 0x62, 0x6a, 0x65, 0x63,
+	0x74, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67,
+	0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c,
+	0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f,
+	0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x70, 0x61, 0x63, 0x6b, 0x22, 0x1d, 0x0a, 0x1b, 0x46, 0x65,
+	0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f,
+	0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52,
+	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52,
+	0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x22, 0x4c, 0x0a, 0x15, 0x47,
+	0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x0b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x70,
+	0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61,
+	0x6c, 0x79, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x0a, 0x6f,
+	0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x32, 0xee, 0x05, 0x0a, 0x11, 0x4f, 0x62,
+	0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x5d, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50,
+	0x6f, 0x6f, 0x6c, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x5d,
+	0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f,
+	0x6f, 0x6c, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x65, 0x6c,
+	0x65, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x7b, 0x0a,
+	0x1a, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54,
+	0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x29, 0x2e, 0x67, 0x69,
+	0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x54, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e,
+	0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x6f,
 	0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50,
-	0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0a, 0x72, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
-	0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f,
-	0x72, 0x79, 0x42, 0x04, 0x98, 0xc6, 0x2c, 0x01, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x6f, 0x72, 0x79, 0x22, 0x4c, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63,
-	0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a,
-	0x0b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x0a, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f,
-	0x6f, 0x6c, 0x32, 0xfb, 0x06, 0x0a, 0x11, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f,
-	0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5d, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x1f, 0x2e, 0x67,
-	0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e,
-	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x62, 0x6a,
-	0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x5d, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x1f, 0x2e, 0x67, 0x69,
-	0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65, 0x63,
-	0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67,
-	0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06,
-	0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x7b, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-	0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x29, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4c, 0x69,
-	0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x6f, 0x4f, 0x62,
-	0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x2a, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50,
-	0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28,
-	0x02, 0x08, 0x01, 0x12, 0x8a, 0x01, 0x0a, 0x1e, 0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x46, 0x72, 0x6f, 0x6d, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x2d, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e,
-	0x55, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79,
-	0x46, 0x72, 0x6f, 0x6d, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x55,
-	0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x46,
-	0x72, 0x6f, 0x6d, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x09, 0x88, 0x02, 0x01, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01,
-	0x12, 0x6c, 0x0a, 0x15, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x61,
+	0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x6c, 0x0a, 0x15, 0x52, 0x65,
+	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x6f, 0x72, 0x79, 0x12, 0x24, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x64,
+	0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f,
+	0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x67, 0x69, 0x74, 0x61,
 	0x6c, 0x79, 0x2e, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x25, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x72,
-	0x0a, 0x17, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41,
-	0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x61,
-	0x6c, 0x79, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74,
-	0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x27, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
-	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02,
-	0x08, 0x01, 0x12, 0x66, 0x0a, 0x13, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f,
-	0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x61,
-	0x6c, 0x79, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e,
-	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f,
+	0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x72, 0x0a, 0x17, 0x44, 0x69, 0x73, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x74, 0x65, 0x73, 0x12, 0x26, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x69, 0x73,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47, 0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x67, 0x69,
+	0x74, 0x61, 0x6c, 0x79, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x47,
+	0x69, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x66, 0x0a, 0x13,
+	0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50,
+	0x6f, 0x6f, 0x6c, 0x12, 0x22, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x46, 0x65, 0x74,
+	0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79,
+	0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x74, 0x6f, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74,
+	0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97,
+	0x28, 0x02, 0x08, 0x01, 0x12, 0x54, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63,
+	0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x1c, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x47,
+	0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74,
 	0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x54, 0x0a, 0x0d, 0x47, 0x65,
-	0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x1c, 0x2e, 0x67, 0x69,
-	0x74, 0x61, 0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f,
-	0x6f, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x67, 0x69, 0x74, 0x61,
-	0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02,
-	0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67,
-	0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79,
-	0x2f, 0x76, 0x31, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69,
-	0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69,
+	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d,
+	0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x34, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -915,62 +799,56 @@ func file_objectpool_proto_rawDescGZIP() []byte {
 	return file_objectpool_proto_rawDescData
 }
 
-var file_objectpool_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_objectpool_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_objectpool_proto_goTypes = []interface{}{
-	(*CreateObjectPoolRequest)(nil),                // 0: gitaly.CreateObjectPoolRequest
-	(*CreateObjectPoolResponse)(nil),               // 1: gitaly.CreateObjectPoolResponse
-	(*DeleteObjectPoolRequest)(nil),                // 2: gitaly.DeleteObjectPoolRequest
-	(*DeleteObjectPoolResponse)(nil),               // 3: gitaly.DeleteObjectPoolResponse
-	(*LinkRepositoryToObjectPoolRequest)(nil),      // 4: gitaly.LinkRepositoryToObjectPoolRequest
-	(*LinkRepositoryToObjectPoolResponse)(nil),     // 5: gitaly.LinkRepositoryToObjectPoolResponse
-	(*UnlinkRepositoryFromObjectPoolRequest)(nil),  // 6: gitaly.UnlinkRepositoryFromObjectPoolRequest
-	(*UnlinkRepositoryFromObjectPoolResponse)(nil), // 7: gitaly.UnlinkRepositoryFromObjectPoolResponse
-	(*ReduplicateRepositoryRequest)(nil),           // 8: gitaly.ReduplicateRepositoryRequest
-	(*ReduplicateRepositoryResponse)(nil),          // 9: gitaly.ReduplicateRepositoryResponse
-	(*DisconnectGitAlternatesRequest)(nil),         // 10: gitaly.DisconnectGitAlternatesRequest
-	(*DisconnectGitAlternatesResponse)(nil),        // 11: gitaly.DisconnectGitAlternatesResponse
-	(*FetchIntoObjectPoolRequest)(nil),             // 12: gitaly.FetchIntoObjectPoolRequest
-	(*FetchIntoObjectPoolResponse)(nil),            // 13: gitaly.FetchIntoObjectPoolResponse
-	(*GetObjectPoolRequest)(nil),                   // 14: gitaly.GetObjectPoolRequest
-	(*GetObjectPoolResponse)(nil),                  // 15: gitaly.GetObjectPoolResponse
-	(*ObjectPool)(nil),                             // 16: gitaly.ObjectPool
-	(*Repository)(nil),                             // 17: gitaly.Repository
+	(*CreateObjectPoolRequest)(nil),            // 0: gitaly.CreateObjectPoolRequest
+	(*CreateObjectPoolResponse)(nil),           // 1: gitaly.CreateObjectPoolResponse
+	(*DeleteObjectPoolRequest)(nil),            // 2: gitaly.DeleteObjectPoolRequest
+	(*DeleteObjectPoolResponse)(nil),           // 3: gitaly.DeleteObjectPoolResponse
+	(*LinkRepositoryToObjectPoolRequest)(nil),  // 4: gitaly.LinkRepositoryToObjectPoolRequest
+	(*LinkRepositoryToObjectPoolResponse)(nil), // 5: gitaly.LinkRepositoryToObjectPoolResponse
+	(*ReduplicateRepositoryRequest)(nil),       // 6: gitaly.ReduplicateRepositoryRequest
+	(*ReduplicateRepositoryResponse)(nil),      // 7: gitaly.ReduplicateRepositoryResponse
+	(*DisconnectGitAlternatesRequest)(nil),     // 8: gitaly.DisconnectGitAlternatesRequest
+	(*DisconnectGitAlternatesResponse)(nil),    // 9: gitaly.DisconnectGitAlternatesResponse
+	(*FetchIntoObjectPoolRequest)(nil),         // 10: gitaly.FetchIntoObjectPoolRequest
+	(*FetchIntoObjectPoolResponse)(nil),        // 11: gitaly.FetchIntoObjectPoolResponse
+	(*GetObjectPoolRequest)(nil),               // 12: gitaly.GetObjectPoolRequest
+	(*GetObjectPoolResponse)(nil),              // 13: gitaly.GetObjectPoolResponse
+	(*ObjectPool)(nil),                         // 14: gitaly.ObjectPool
+	(*Repository)(nil),                         // 15: gitaly.Repository
 }
 var file_objectpool_proto_depIdxs = []int32{
-	16, // 0: gitaly.CreateObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
-	17, // 1: gitaly.CreateObjectPoolRequest.origin:type_name -> gitaly.Repository
-	16, // 2: gitaly.DeleteObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
-	16, // 3: gitaly.LinkRepositoryToObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
-	17, // 4: gitaly.LinkRepositoryToObjectPoolRequest.repository:type_name -> gitaly.Repository
-	17, // 5: gitaly.UnlinkRepositoryFromObjectPoolRequest.repository:type_name -> gitaly.Repository
-	16, // 6: gitaly.UnlinkRepositoryFromObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
-	17, // 7: gitaly.ReduplicateRepositoryRequest.repository:type_name -> gitaly.Repository
-	17, // 8: gitaly.DisconnectGitAlternatesRequest.repository:type_name -> gitaly.Repository
-	17, // 9: gitaly.FetchIntoObjectPoolRequest.origin:type_name -> gitaly.Repository
-	16, // 10: gitaly.FetchIntoObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
-	17, // 11: gitaly.GetObjectPoolRequest.repository:type_name -> gitaly.Repository
-	16, // 12: gitaly.GetObjectPoolResponse.object_pool:type_name -> gitaly.ObjectPool
-	0,  // 13: gitaly.ObjectPoolService.CreateObjectPool:input_type -> gitaly.CreateObjectPoolRequest
-	2,  // 14: gitaly.ObjectPoolService.DeleteObjectPool:input_type -> gitaly.DeleteObjectPoolRequest
-	4,  // 15: gitaly.ObjectPoolService.LinkRepositoryToObjectPool:input_type -> gitaly.LinkRepositoryToObjectPoolRequest
-	6,  // 16: gitaly.ObjectPoolService.UnlinkRepositoryFromObjectPool:input_type -> gitaly.UnlinkRepositoryFromObjectPoolRequest
-	8,  // 17: gitaly.ObjectPoolService.ReduplicateRepository:input_type -> gitaly.ReduplicateRepositoryRequest
-	10, // 18: gitaly.ObjectPoolService.DisconnectGitAlternates:input_type -> gitaly.DisconnectGitAlternatesRequest
-	12, // 19: gitaly.ObjectPoolService.FetchIntoObjectPool:input_type -> gitaly.FetchIntoObjectPoolRequest
-	14, // 20: gitaly.ObjectPoolService.GetObjectPool:input_type -> gitaly.GetObjectPoolRequest
-	1,  // 21: gitaly.ObjectPoolService.CreateObjectPool:output_type -> gitaly.CreateObjectPoolResponse
-	3,  // 22: gitaly.ObjectPoolService.DeleteObjectPool:output_type -> gitaly.DeleteObjectPoolResponse
-	5,  // 23: gitaly.ObjectPoolService.LinkRepositoryToObjectPool:output_type -> gitaly.LinkRepositoryToObjectPoolResponse
-	7,  // 24: gitaly.ObjectPoolService.UnlinkRepositoryFromObjectPool:output_type -> gitaly.UnlinkRepositoryFromObjectPoolResponse
-	9,  // 25: gitaly.ObjectPoolService.ReduplicateRepository:output_type -> gitaly.ReduplicateRepositoryResponse
-	11, // 26: gitaly.ObjectPoolService.DisconnectGitAlternates:output_type -> gitaly.DisconnectGitAlternatesResponse
-	13, // 27: gitaly.ObjectPoolService.FetchIntoObjectPool:output_type -> gitaly.FetchIntoObjectPoolResponse
-	15, // 28: gitaly.ObjectPoolService.GetObjectPool:output_type -> gitaly.GetObjectPoolResponse
-	21, // [21:29] is the sub-list for method output_type
-	13, // [13:21] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
+	14, // 0: gitaly.CreateObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
+	15, // 1: gitaly.CreateObjectPoolRequest.origin:type_name -> gitaly.Repository
+	14, // 2: gitaly.DeleteObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
+	14, // 3: gitaly.LinkRepositoryToObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
+	15, // 4: gitaly.LinkRepositoryToObjectPoolRequest.repository:type_name -> gitaly.Repository
+	15, // 5: gitaly.ReduplicateRepositoryRequest.repository:type_name -> gitaly.Repository
+	15, // 6: gitaly.DisconnectGitAlternatesRequest.repository:type_name -> gitaly.Repository
+	15, // 7: gitaly.FetchIntoObjectPoolRequest.origin:type_name -> gitaly.Repository
+	14, // 8: gitaly.FetchIntoObjectPoolRequest.object_pool:type_name -> gitaly.ObjectPool
+	15, // 9: gitaly.GetObjectPoolRequest.repository:type_name -> gitaly.Repository
+	14, // 10: gitaly.GetObjectPoolResponse.object_pool:type_name -> gitaly.ObjectPool
+	0,  // 11: gitaly.ObjectPoolService.CreateObjectPool:input_type -> gitaly.CreateObjectPoolRequest
+	2,  // 12: gitaly.ObjectPoolService.DeleteObjectPool:input_type -> gitaly.DeleteObjectPoolRequest
+	4,  // 13: gitaly.ObjectPoolService.LinkRepositoryToObjectPool:input_type -> gitaly.LinkRepositoryToObjectPoolRequest
+	6,  // 14: gitaly.ObjectPoolService.ReduplicateRepository:input_type -> gitaly.ReduplicateRepositoryRequest
+	8,  // 15: gitaly.ObjectPoolService.DisconnectGitAlternates:input_type -> gitaly.DisconnectGitAlternatesRequest
+	10, // 16: gitaly.ObjectPoolService.FetchIntoObjectPool:input_type -> gitaly.FetchIntoObjectPoolRequest
+	12, // 17: gitaly.ObjectPoolService.GetObjectPool:input_type -> gitaly.GetObjectPoolRequest
+	1,  // 18: gitaly.ObjectPoolService.CreateObjectPool:output_type -> gitaly.CreateObjectPoolResponse
+	3,  // 19: gitaly.ObjectPoolService.DeleteObjectPool:output_type -> gitaly.DeleteObjectPoolResponse
+	5,  // 20: gitaly.ObjectPoolService.LinkRepositoryToObjectPool:output_type -> gitaly.LinkRepositoryToObjectPoolResponse
+	7,  // 21: gitaly.ObjectPoolService.ReduplicateRepository:output_type -> gitaly.ReduplicateRepositoryResponse
+	9,  // 22: gitaly.ObjectPoolService.DisconnectGitAlternates:output_type -> gitaly.DisconnectGitAlternatesResponse
+	11, // 23: gitaly.ObjectPoolService.FetchIntoObjectPool:output_type -> gitaly.FetchIntoObjectPoolResponse
+	13, // 24: gitaly.ObjectPoolService.GetObjectPool:output_type -> gitaly.GetObjectPoolResponse
+	18, // [18:25] is the sub-list for method output_type
+	11, // [11:18] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_objectpool_proto_init() }
@@ -1054,30 +932,6 @@ func file_objectpool_proto_init() {
 			}
 		}
 		file_objectpool_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UnlinkRepositoryFromObjectPoolRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_objectpool_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UnlinkRepositoryFromObjectPoolResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_objectpool_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReduplicateRepositoryRequest); i {
 			case 0:
 				return &v.state
@@ -1089,7 +943,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReduplicateRepositoryResponse); i {
 			case 0:
 				return &v.state
@@ -1101,7 +955,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DisconnectGitAlternatesRequest); i {
 			case 0:
 				return &v.state
@@ -1113,7 +967,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DisconnectGitAlternatesResponse); i {
 			case 0:
 				return &v.state
@@ -1125,7 +979,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchIntoObjectPoolRequest); i {
 			case 0:
 				return &v.state
@@ -1137,7 +991,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchIntoObjectPoolResponse); i {
 			case 0:
 				return &v.state
@@ -1149,7 +1003,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetObjectPoolRequest); i {
 			case 0:
 				return &v.state
@@ -1161,7 +1015,7 @@ func file_objectpool_proto_init() {
 				return nil
 			}
 		}
-		file_objectpool_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_objectpool_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetObjectPoolResponse); i {
 			case 0:
 				return &v.state
@@ -1180,7 +1034,7 @@ func file_objectpool_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_objectpool_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   16,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/proto/go/gitalypb/objectpool_grpc.pb.go b/proto/go/gitalypb/objectpool_grpc.pb.go
index 56f258484..b46a4bc1c 100644
--- a/proto/go/gitalypb/objectpool_grpc.pb.go
+++ b/proto/go/gitalypb/objectpool_grpc.pb.go
@@ -22,18 +22,6 @@ type ObjectPoolServiceClient interface {
 	DeleteObjectPool(ctx context.Context, in *DeleteObjectPoolRequest, opts ...grpc.CallOption) (*DeleteObjectPoolResponse, error)
 	// Repositories are assumed to be stored on the same disk
 	LinkRepositoryToObjectPool(ctx context.Context, in *LinkRepositoryToObjectPoolRequest, opts ...grpc.CallOption) (*LinkRepositoryToObjectPoolResponse, error)
-	// Deprecated: Do not use.
-	// UnlinkRepositoryFromObjectPool does not unlink the repository from the
-	// object pool as you'd think, but all it really does is to remove the object
-	// pool's remote pointing to the repository. And even this is a no-op given
-	// that we'd try to remove the remote by the repository's `GlRepository()`
-	// name, which we never create in the first place. To unlink repositories
-	// from an object pool, you'd really want to execute DisconnectGitAlternates
-	// to remove the repository's link to the pool's object database.
-	//
-	// This function is never called by anyone and highly misleading. It's thus
-	// deprecated and will be removed in v14.4.
-	UnlinkRepositoryFromObjectPool(ctx context.Context, in *UnlinkRepositoryFromObjectPoolRequest, opts ...grpc.CallOption) (*UnlinkRepositoryFromObjectPoolResponse, error)
 	ReduplicateRepository(ctx context.Context, in *ReduplicateRepositoryRequest, opts ...grpc.CallOption) (*ReduplicateRepositoryResponse, error)
 	DisconnectGitAlternates(ctx context.Context, in *DisconnectGitAlternatesRequest, opts ...grpc.CallOption) (*DisconnectGitAlternatesResponse, error)
 	FetchIntoObjectPool(ctx context.Context, in *FetchIntoObjectPoolRequest, opts ...grpc.CallOption) (*FetchIntoObjectPoolResponse, error)
@@ -75,16 +63,6 @@ func (c *objectPoolServiceClient) LinkRepositoryToObjectPool(ctx context.Context
 	return out, nil
 }
 
-// Deprecated: Do not use.
-func (c *objectPoolServiceClient) UnlinkRepositoryFromObjectPool(ctx context.Context, in *UnlinkRepositoryFromObjectPoolRequest, opts ...grpc.CallOption) (*UnlinkRepositoryFromObjectPoolResponse, error) {
-	out := new(UnlinkRepositoryFromObjectPoolResponse)
-	err := c.cc.Invoke(ctx, "/gitaly.ObjectPoolService/UnlinkRepositoryFromObjectPool", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *objectPoolServiceClient) ReduplicateRepository(ctx context.Context, in *ReduplicateRepositoryRequest, opts ...grpc.CallOption) (*ReduplicateRepositoryResponse, error) {
 	out := new(ReduplicateRepositoryResponse)
 	err := c.cc.Invoke(ctx, "/gitaly.ObjectPoolService/ReduplicateRepository", in, out, opts...)
@@ -129,18 +107,6 @@ type ObjectPoolServiceServer interface {
 	DeleteObjectPool(context.Context, *DeleteObjectPoolRequest) (*DeleteObjectPoolResponse, error)
 	// Repositories are assumed to be stored on the same disk
 	LinkRepositoryToObjectPool(context.Context, *LinkRepositoryToObjectPoolRequest) (*LinkRepositoryToObjectPoolResponse, error)
-	// Deprecated: Do not use.
-	// UnlinkRepositoryFromObjectPool does not unlink the repository from the
-	// object pool as you'd think, but all it really does is to remove the object
-	// pool's remote pointing to the repository. And even this is a no-op given
-	// that we'd try to remove the remote by the repository's `GlRepository()`
-	// name, which we never create in the first place. To unlink repositories
-	// from an object pool, you'd really want to execute DisconnectGitAlternates
-	// to remove the repository's link to the pool's object database.
-	//
-	// This function is never called by anyone and highly misleading. It's thus
-	// deprecated and will be removed in v14.4.
-	UnlinkRepositoryFromObjectPool(context.Context, *UnlinkRepositoryFromObjectPoolRequest) (*UnlinkRepositoryFromObjectPoolResponse, error)
 	ReduplicateRepository(context.Context, *ReduplicateRepositoryRequest) (*ReduplicateRepositoryResponse, error)
 	DisconnectGitAlternates(context.Context, *DisconnectGitAlternatesRequest) (*DisconnectGitAlternatesResponse, error)
 	FetchIntoObjectPool(context.Context, *FetchIntoObjectPoolRequest) (*FetchIntoObjectPoolResponse, error)
@@ -161,9 +127,6 @@ func (UnimplementedObjectPoolServiceServer) DeleteObjectPool(context.Context, *D
 func (UnimplementedObjectPoolServiceServer) LinkRepositoryToObjectPool(context.Context, *LinkRepositoryToObjectPoolRequest) (*LinkRepositoryToObjectPoolResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method LinkRepositoryToObjectPool not implemented")
 }
-func (UnimplementedObjectPoolServiceServer) UnlinkRepositoryFromObjectPool(context.Context, *UnlinkRepositoryFromObjectPoolRequest) (*UnlinkRepositoryFromObjectPoolResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UnlinkRepositoryFromObjectPool not implemented")
-}
 func (UnimplementedObjectPoolServiceServer) ReduplicateRepository(context.Context, *ReduplicateRepositoryRequest) (*ReduplicateRepositoryResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ReduplicateRepository not implemented")
 }
@@ -243,24 +206,6 @@ func _ObjectPoolService_LinkRepositoryToObjectPool_Handler(srv interface{}, ctx
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ObjectPoolService_UnlinkRepositoryFromObjectPool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UnlinkRepositoryFromObjectPoolRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ObjectPoolServiceServer).UnlinkRepositoryFromObjectPool(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/gitaly.ObjectPoolService/UnlinkRepositoryFromObjectPool",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ObjectPoolServiceServer).UnlinkRepositoryFromObjectPool(ctx, req.(*UnlinkRepositoryFromObjectPoolRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ObjectPoolService_ReduplicateRepository_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ReduplicateRepositoryRequest)
 	if err := dec(in); err != nil {
@@ -353,10 +298,6 @@ var ObjectPoolService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _ObjectPoolService_LinkRepositoryToObjectPool_Handler,
 		},
 		{
-			MethodName: "UnlinkRepositoryFromObjectPool",
-			Handler:    _ObjectPoolService_UnlinkRepositoryFromObjectPool_Handler,
-		},
-		{
 			MethodName: "ReduplicateRepository",
 			Handler:    _ObjectPoolService_ReduplicateRepository_Handler,
 		},
diff --git a/proto/objectpool.proto b/proto/objectpool.proto
index dcbfb9a9d..e6be24c39 100644
--- a/proto/objectpool.proto
+++ b/proto/objectpool.proto
@@ -26,23 +26,6 @@ service ObjectPoolService {
     };
   }
 
-  // UnlinkRepositoryFromObjectPool does not unlink the repository from the
-  // object pool as you'd think, but all it really does is to remove the object
-  // pool's remote pointing to the repository. And even this is a no-op given
-  // that we'd try to remove the remote by the repository's `GlRepository()`
-  // name, which we never create in the first place. To unlink repositories
-  // from an object pool, you'd really want to execute DisconnectGitAlternates
-  // to remove the repository's link to the pool's object database.
-  //
-  // This function is never called by anyone and highly misleading. It's thus
-  // deprecated and will be removed in v14.4.
-  rpc UnlinkRepositoryFromObjectPool(UnlinkRepositoryFromObjectPoolRequest) returns (UnlinkRepositoryFromObjectPoolResponse) {
-    option deprecated = true;
-    option (op_type) = {
-      op: MUTATOR
-    };
-  }
-
   rpc ReduplicateRepository(ReduplicateRepositoryRequest) returns (ReduplicateRepositoryResponse) {
     option (op_type) = {
       op: MUTATOR
@@ -86,14 +69,6 @@ message LinkRepositoryToObjectPoolRequest {
 }
 message LinkRepositoryToObjectPoolResponse {}
 
-// This RPC doesn't require the ObjectPool as it will remove the alternates file
-// from the pool participant. The caller is responsible no data loss occurs.
-message UnlinkRepositoryFromObjectPoolRequest {
-  Repository repository = 1 [(target_repository)=true]; // already specified as the target repo field
-  ObjectPool object_pool = 2 [(additional_repository)=true];
-}
-message UnlinkRepositoryFromObjectPoolResponse {}
-
 message ReduplicateRepositoryRequest {
   Repository repository = 1 [(target_repository)=true];
 }
diff --git a/ruby/proto/gitaly/objectpool_pb.rb b/ruby/proto/gitaly/objectpool_pb.rb
index cf12ea6a5..f841b88b6 100644
--- a/ruby/proto/gitaly/objectpool_pb.rb
+++ b/ruby/proto/gitaly/objectpool_pb.rb
@@ -24,12 +24,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_message "gitaly.LinkRepositoryToObjectPoolResponse" do
     end
-    add_message "gitaly.UnlinkRepositoryFromObjectPoolRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :object_pool, :message, 2, "gitaly.ObjectPool"
-    end
-    add_message "gitaly.UnlinkRepositoryFromObjectPoolResponse" do
-    end
     add_message "gitaly.ReduplicateRepositoryRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
     end
@@ -63,8 +57,6 @@ module Gitaly
   DeleteObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.DeleteObjectPoolResponse").msgclass
   LinkRepositoryToObjectPoolRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LinkRepositoryToObjectPoolRequest").msgclass
   LinkRepositoryToObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LinkRepositoryToObjectPoolResponse").msgclass
-  UnlinkRepositoryFromObjectPoolRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UnlinkRepositoryFromObjectPoolRequest").msgclass
-  UnlinkRepositoryFromObjectPoolResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UnlinkRepositoryFromObjectPoolResponse").msgclass
   ReduplicateRepositoryRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReduplicateRepositoryRequest").msgclass
   ReduplicateRepositoryResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReduplicateRepositoryResponse").msgclass
   DisconnectGitAlternatesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.DisconnectGitAlternatesRequest").msgclass
diff --git a/ruby/proto/gitaly/objectpool_services_pb.rb b/ruby/proto/gitaly/objectpool_services_pb.rb
index e8c932bfd..1abbb56d0 100644
--- a/ruby/proto/gitaly/objectpool_services_pb.rb
+++ b/ruby/proto/gitaly/objectpool_services_pb.rb
@@ -18,17 +18,6 @@ module Gitaly
       rpc :DeleteObjectPool, Gitaly::DeleteObjectPoolRequest, Gitaly::DeleteObjectPoolResponse
       # Repositories are assumed to be stored on the same disk
       rpc :LinkRepositoryToObjectPool, Gitaly::LinkRepositoryToObjectPoolRequest, Gitaly::LinkRepositoryToObjectPoolResponse
-      # UnlinkRepositoryFromObjectPool does not unlink the repository from the
-      # object pool as you'd think, but all it really does is to remove the object
-      # pool's remote pointing to the repository. And even this is a no-op given
-      # that we'd try to remove the remote by the repository's `GlRepository()`
-      # name, which we never create in the first place. To unlink repositories
-      # from an object pool, you'd really want to execute DisconnectGitAlternates
-      # to remove the repository's link to the pool's object database.
-      #
-      # This function is never called by anyone and highly misleading. It's thus
-      # deprecated and will be removed in v14.4.
-      rpc :UnlinkRepositoryFromObjectPool, Gitaly::UnlinkRepositoryFromObjectPoolRequest, Gitaly::UnlinkRepositoryFromObjectPoolResponse
       rpc :ReduplicateRepository, Gitaly::ReduplicateRepositoryRequest, Gitaly::ReduplicateRepositoryResponse
       rpc :DisconnectGitAlternates, Gitaly::DisconnectGitAlternatesRequest, Gitaly::DisconnectGitAlternatesResponse
       rpc :FetchIntoObjectPool, Gitaly::FetchIntoObjectPoolRequest, Gitaly::FetchIntoObjectPoolResponse