Document new annotations for Connect injections

This commit is contained in:
Luke Kysow 2019-10-04 15:31:24 -07:00
parent 53f3962cab
commit 17990aabf3
No known key found for this signature in database
GPG Key ID: FA168D4DC3F04307
1 changed files with 30 additions and 12 deletions

View File

@ -180,13 +180,15 @@ Annotations can be used to configure the injection behavior.
The name of the service is the name of the service registered with Consul. You can optionally specify datacenters with this annotation.
```annotations:
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams":"[service-name]:[port]:[optional datacenter]"
```
* [Prepared Query](https://www.consul.io/docs/connect/proxies.html#upstreams)
```annotations:
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams": "prepared_query:[query name]:[port]"
````
@ -194,18 +196,16 @@ Annotations can be used to configure the injection behavior.
If you would like to specify multiple services or upstreams, delimit them with commas
```annotations:
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams":"[service-name]:[port]:[optional datacenter],[service-name]:[port]:[optional datacenter]"
```
```annotations:
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams":"[service-name]:[port]:[optional datacenter],prepared_query:[query name]:[port]"
```
* `consul.hashicorp.com/connect-service-protocol` - For pods that will be
registered with Consul's [central configuration](/docs/agent/config_entries.html)
feature, information about the protocol the service uses is required. Users
@ -214,6 +214,24 @@ Annotations can be used to configure the injection behavior.
[defaultProtocol](/docs/platform/k8s/helm.html#v-connectinject-centralconfig-defaultprotocol)
option. Specific annotations will always override the default value.
* `consul.hashicorp.com/service-tags` - A comma separated list of tags that will
be applied to the Consul service and its sidecar.
```yaml
annotations:
consul.hashicorp.com/service-tags: foo,bar,baz
```
* `consul.hashicorp.com/service-meta-<YOUR_KEY>` - Set Consul meta key/value
pairs that will be applied to the Consul service and its sidecar.
The key will be what comes after `consul.hashicorp.com/service-meta-`, e.g.
`consul.hashicorp.com/service-meta-foo: bar` will result in `foo: bar`.
```yaml
annotations:
consul.hashicorp.com/service-meta-foo: baz
consul.hashicorp.com/service-meta-bar: baz
```
### Deployments, StatefulSets, etc.