diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2020-02-10 20:00:34 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2020-02-10 20:00:34 +0300 |
| commit | 4c854bf270703de52af43c551d85bc30afeb869e (patch) | |
| tree | de0c83e57a5455cc4222066dccab15a4d4c2b5ac | |
| parent | 8ce545e269d47139a607105f14ee106406bfff37 (diff) | |
| parent | 7b354e81f10fbc349b6e086a9a1769e2afd9e130 (diff) | |
Merge branch 'po-praefect-conn-checker-token' into 'master'
Use token auth for Praefect connection checker
Closes #2393
See merge request gitlab-org/gitaly!1816
| -rw-r--r-- | changelogs/unreleased/po-praefect-conn-checker-token.yml | 5 | ||||
| -rw-r--r-- | cmd/praefect/subcmd_pingnodes.go | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/changelogs/unreleased/po-praefect-conn-checker-token.yml b/changelogs/unreleased/po-praefect-conn-checker-token.yml new file mode 100644 index 000000000..c7d266a8d --- /dev/null +++ b/changelogs/unreleased/po-praefect-conn-checker-token.yml @@ -0,0 +1,5 @@ +--- +title: Use token auth for Praefect connection checker +merge_request: 1816 +author: +type: fixed diff --git a/cmd/praefect/subcmd_pingnodes.go b/cmd/praefect/subcmd_pingnodes.go index 3aba0c484..0423c88b0 100644 --- a/cmd/praefect/subcmd_pingnodes.go +++ b/cmd/praefect/subcmd_pingnodes.go @@ -7,6 +7,7 @@ import ( "sync" "time" + gitalyauth "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/client" "gitlab.com/gitlab-org/gitaly/internal/praefect/config" "google.golang.org/grpc" @@ -68,10 +69,20 @@ func dialNodes(conf config.Config) int { } func (npr *nodePing) dial() (*grpc.ClientConn, error) { - return client.Dial(npr.address, []grpc.DialOption{ + opts := []grpc.DialOption{ grpc.WithBlock(), grpc.WithTimeout(30 * time.Second), - }) + } + + if len(npr.token) > 0 { + opts = append(opts, + grpc.WithPerRPCCredentials( + gitalyauth.RPCCredentialsV2(npr.token), + ), + ) + } + + return client.Dial(npr.address, opts) } func (npr *nodePing) healthCheck(cc *grpc.ClientConn) (grpc_health_v1.HealthCheckResponse_ServingStatus, error) { |