Skip to content

Commit

Permalink
consul: add support for grpc_ca_file for tls grpc connections in cons…
Browse files Browse the repository at this point in the history
…ul 1.14+

This PR adds client config to Nomad for specifying consul.grpc_ca_file

These changes combined with hashicorp/consul#15913 should
finally enable Nomad users to upgrade to Consul 1.14+ and use tls grpc connections.
  • Loading branch information
shoenig committed Jan 9, 2023
1 parent d472184 commit e5f7f28
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions client/allocrunner/consul_grpc_sock_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func newConsulGRPCSocketHook(
if !ok {
consulGRPCPort = consulGRPCFallbackPort
}
logger.Info("CONSUL GRPC DEBUG", "consulGRPCPort", consulGRPCPort)

return &consulGRPCSocketHook{
alloc: alloc,
Expand Down Expand Up @@ -302,8 +301,6 @@ func proxyConn(ctx context.Context, logger hclog.Logger, destAddr string, conn n
// Close the connection when we're done with it.
defer conn.Close()

logger.Info("CONSUL GRPC DEBUG", "destAddr", destAddr)

ctx, cancel := context.WithCancel(ctx)
defer cancel()

Expand Down
2 changes: 0 additions & 2 deletions client/allocrunner/taskrunner/envoy_bootstrap_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,6 @@ func (h *envoyBootstrapHook) Prestart(ctx context.Context, req *ifs.TaskPrestart
// Create command line arguments
bootstrapArgs := bootstrap.args()

h.logger.Info("CONSUL GRPC DEBUG", "bootstrap args", bootstrapArgs)

// Write args to file for debugging
argsFile, err := os.Create(bootstrapCmdPath)
if err != nil {
Expand Down

0 comments on commit e5f7f28

Please sign in to comment.