Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2021-10-06 19:28:00 +0300
committerJacob Vosmaer <jacob@gitlab.com>2021-10-06 20:27:46 +0300
commit9afed4db259197170992383d7710445dfca4f098 (patch)
treef3f52be532668de0fd1ea098d305c60bd8d29670 /internal/praefect/server_factory.go
parent5027043f38fc5eac159135647e6d4fb03495cbb4 (diff)
Praefect: proxy sidechannels
This commit adds backchannel support to the main gRPC listener of Praefect. And if clients make gRPC calls with sidechannels, Praefect will now proxy these to the Gitaly backend. Changelog: added
Diffstat (limited to 'internal/praefect/server_factory.go')
-rw-r--r--internal/praefect/server_factory.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/praefect/server_factory.go b/internal/praefect/server_factory.go
index e27661b0e..3b37d0559 100644
--- a/internal/praefect/server_factory.go
+++ b/internal/praefect/server_factory.go
@@ -102,7 +102,7 @@ func (s *ServerFactory) Create(secure bool) (*grpc.Server, error) {
defer s.mtx.Unlock()
if !secure {
- s.insecure = append(s.insecure, s.createGRPC())
+ s.insecure = append(s.insecure, s.createGRPC(nil))
return s.insecure[len(s.insecure)-1], nil
}
@@ -111,15 +111,15 @@ func (s *ServerFactory) Create(secure bool) (*grpc.Server, error) {
return nil, fmt.Errorf("load certificate key pair: %w", err)
}
- s.secure = append(s.secure, s.createGRPC(grpc.Creds(credentials.NewTLS(&tls.Config{
+ s.secure = append(s.secure, s.createGRPC(credentials.NewTLS(&tls.Config{
Certificates: []tls.Certificate{cert},
MinVersion: tls.VersionTLS12,
- }))))
+ })))
return s.secure[len(s.secure)-1], nil
}
-func (s *ServerFactory) createGRPC(grpcOpts ...grpc.ServerOption) *grpc.Server {
+func (s *ServerFactory) createGRPC(creds credentials.TransportCredentials) *grpc.Server {
return NewGRPCServer(
s.conf,
s.logger,
@@ -132,7 +132,7 @@ func (s *ServerFactory) createGRPC(grpcOpts ...grpc.ServerOption) *grpc.Server {
s.assignmentStore,
s.conns,
s.primaryGetter,
- grpcOpts...,
+ creds,
)
}