github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename GRPC->XDS where appropriate

pull/10588/head
Daniel Nephin 2021-07-09 12:17:45 -04:00
parent 13bd86527b
commit 7d73fd7ae5
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/agent.go
View File

@ -617,8 +617,7 @@ func (a *Agent) Start(ctx context.Context) error {
a.apiServers.Start(srv) a.apiServers.Start(srv)
} }
// Start gRPC server. if err := a.listenAndServeXDS(); err != nil {
if err := a.listenAndServeGRPC(); err != nil {
return err return err
} }
@ -661,7 +660,7 @@ func (a *Agent) Failed() <-chan struct{} {
return a.apiServers.failed return a.apiServers.failed
} }
func (a *Agent) listenAndServeGRPC() error { func (a *Agent) listenAndServeXDS() error {
if len(a.config.GRPCAddrs) < 1 { if len(a.config.GRPCAddrs) < 1 {
return nil return nil
} }
@ -682,11 +681,7 @@ func (a *Agent) listenAndServeGRPC() error {
if a.config.HTTPSPort <= 0 { if a.config.HTTPSPort <= 0 {
tlsConfig = nil tlsConfig = nil
} }
var err error a.grpcServer = xds.NewGRPCServer(xdsServer, tlsConfig)
a.grpcServer, err = xdsServer.GRPCServer(tlsConfig)
if err != nil {
return err
}
ln, err := a.startListeners(a.config.GRPCAddrs) ln, err := a.startListeners(a.config.GRPCAddrs)
if err != nil { if err != nil {

10
agent/xds/server.go
View File

@ -543,14 +543,15 @@ func tokenFromContext(ctx context.Context) string {
return "" return ""
} }
// GRPCServer returns a server instance that can handle xDS requests. // NewGRPCServer creates a grpc.Server, registers the Server, and then returns
func (s *Server) GRPCServer(tlsConfigurator *tlsutil.Configurator) (*grpc.Server, error) { // the grpc.Server.
func NewGRPCServer(s *Server, tlsConfigurator *tlsutil.Configurator) *grpc.Server {
opts := []grpc.ServerOption{ opts := []grpc.ServerOption{
grpc.MaxConcurrentStreams(2048), grpc.MaxConcurrentStreams(2048),
} }
if tlsConfigurator != nil { if tlsConfigurator != nil {
if tlsConfigurator.Cert() != nil { if tlsConfigurator.Cert() != nil {
creds := credentials.NewTLS(tlsConfigurator.IncomingGRPCConfig()) creds := credentials.NewTLS(tlsConfigurator.IncomingXDSConfig())
opts = append(opts, grpc.Creds(creds)) opts = append(opts, grpc.Creds(creds))
} }
} }
@ -560,8 +561,7 @@ func (s *Server) GRPCServer(tlsConfigurator *tlsutil.Configurator) (*grpc.Server
if !s.DisableV2Protocol { if !s.DisableV2Protocol {
envoy_discovery_v2.RegisterAggregatedDiscoveryServiceServer(srv, &adsServerV2Shim{srv: s}) envoy_discovery_v2.RegisterAggregatedDiscoveryServiceServer(srv, &adsServerV2Shim{srv: s})
} }
return srv
return srv, nil
} }
func (s *Server) checkStreamACLs(streamCtx context.Context, cfgSnap *proxycfg.ConfigSnapshot) error { func (s *Server) checkStreamACLs(streamCtx context.Context, cfgSnap *proxycfg.ConfigSnapshot) error {

8
tlsutil/config.go
View File

@ -604,9 +604,9 @@ func (c *Configurator) VerifyServerHostname() bool {
return c.base.VerifyServerHostname || c.autoTLS.verifyServerHostname return c.base.VerifyServerHostname || c.autoTLS.verifyServerHostname
} }
// IncomingGRPCConfig generates a *tls.Config for incoming GRPC connections. // IncomingXDSConfig generates a *tls.Config for incoming xDS connections.
func (c *Configurator) IncomingGRPCConfig() *tls.Config { func (c *Configurator) IncomingXDSConfig() *tls.Config {
c.log("IncomingGRPCConfig") c.log("IncomingXDSConfig")
// false has the effect that this config doesn't require a client cert // false has the effect that this config doesn't require a client cert
// verification. This is because there is no verify_incoming_grpc // verification. This is because there is no verify_incoming_grpc
@ -615,7 +615,7 @@ func (c *Configurator) IncomingGRPCConfig() *tls.Config {
// effect on the grpc server. // effect on the grpc server.
config := c.commonTLSConfig(false) config := c.commonTLSConfig(false)
config.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) { config.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) {
return c.IncomingGRPCConfig(), nil return c.IncomingXDSConfig(), nil
} }
return config return config
} }