Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

feature: Register consul services with agent API #567

Merged
lx merged 10 commits from unrob/garage:roberto/consul-agent-registration into main 2023-06-02 14:35:00 +00:00
Conversation 4 Commits 10 Files changed 4 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 32ad4538ee - Show all commits

4
doc/book/reference-manual/configuration.md
View file

@ -41,7 +41,7 @@ service_name = "garage-daemon"
ca_cert = "/etc/consul/consul-ca.crt" ca_cert = "/etc/consul/consul-ca.crt"
client_cert = "/etc/consul/consul-client.crt" client_cert = "/etc/consul/consul-client.crt"
client_key = "/etc/consul/consul-key.crt" client_key = "/etc/consul/consul-key.crt"
# for `catalog` API mode, unset client_cert and client_key, and optionally enable `token` # for `agent` API mode, unset client_cert and client_key, and optionally enable `token`
unrob marked this conversation as resolved Outdated
lx commented 2023-05-22 09:05:21 +00:00
Outdated
Review
Copy link

I think you meant for agent API mode instead?

I think you meant for `agent` API mode instead?
# token = "abcdef-01234-56789" # token = "abcdef-01234-56789"
unrob marked this conversation as resolved Outdated
lx commented 2023-05-11 09:39:24 +00:00
Outdated
Review
Copy link

Similarly, I'd suggest calling this simply token

Similarly, I'd suggest calling this simply `token`
tls_skip_verify = false tls_skip_verify = false
tags = [ "dns-enabled" ] tags = [ "dns-enabled" ]
@ -326,7 +326,7 @@ The `consul_http_addr` parameter should be set to the full HTTP(S) address of th
Two APIs for service registration are supported: `catalog` and `agent`. `catalog`, the default, will register a service using Two APIs for service registration are supported: `catalog` and `agent`. `catalog`, the default, will register a service using
the `/v1/catalog` endpoints, enabling mTLS if `client_cert` and `client_key` are provided. The `agent` API uses the the `/v1/catalog` endpoints, enabling mTLS if `client_cert` and `client_key` are provided. The `agent` API uses the
`v1/agent` endpoints instead, where an optional `consul_http_token` may be provided. `v1/agent` endpoints instead, where an optional `token` may be provided.
unrob marked this conversation as resolved Outdated
lx commented 2023-05-22 09:06:02 +00:00
Outdated
Review
Copy link

token instead of consul_http_token

`token` instead of `consul_http_token`
### `service_name` ### `service_name`