connect/native: doc and comment tweaks from PR

This commit is contained in:
Seth Hoenig
2020-06-24 10:13:22 -05:00
parent cd3ec2f783
commit ef52328eb4
5 changed files with 7 additions and 7 deletions

View File

@@ -83,7 +83,6 @@ func (h *connectNativeHook) Prestart(
return nil
}
h.logger.Debug("share consul TLS configuration for connect native", "enabled", h.consulShareTLS, "task", request.Task.Name)
if h.consulShareTLS {
// copy TLS certificates
if err := h.copyCertificates(h.consulConfig, request.TaskDir.SecretsDir); err != nil {

View File

@@ -47,7 +47,7 @@ func parseService(o *ast.ObjectItem) (*api.Service, error) {
"address_mode",
"check_restart",
"connect",
"task", // todo
"task",
"meta",
"canary_meta",
}

View File

@@ -483,7 +483,7 @@ func (s *Service) Validate() error {
// if service is connect native, service task must be set
if s.Connect.IsNative() && len(s.TaskName) == 0 {
mErr.Errors = append(mErr.Errors, fmt.Errorf("Service %s is connect native and requires setting the task", s.Name))
mErr.Errors = append(mErr.Errors, fmt.Errorf("Service %s is Connect Native and requires setting the task", s.Name))
}
}

View File

@@ -106,9 +106,9 @@ configuring Nomad to talk to Consul via DNS such as consul.service.consul
- `share_ssl` `(bool: true)` - Specifies whether the Nomad client should share
its Consul SSL configuration with Connect Native applications. Includes values
of `ca_file`, `cert_file`, `key_file`, `auth`, `ssl`, and `verify_ssl`. Does
not include the value for the ACL `token`. This option should be disabled in
an untrusted environment.
of `ca_file`, `cert_file`, `key_file`, `ssl`, and `verify_ssl`. Does not include
the values for the ACL `token` or `auth`. This option should be disabled in
environments where Consul ACLs are not enabled.
- `ssl` `(bool: false)` - Specifies if the transport scheme should use HTTPS to
communicate with the Consul agent. Will default to the `CONSUL_HTTP_SSL`

View File

@@ -189,8 +189,9 @@ service {
### Limitations
[Nomad variable interpolation][interpolation] is _not_ yet supported.
[Nomad variable interpolation][interpolation] is _not_ yet supported ([gh-7221]).
[gh-7221]: https://github.com/hashicorp/nomad/issues/7221
[job]: /docs/job-specification/job 'Nomad job Job Specification'
[group]: /docs/job-specification/group 'Nomad group Job Specification'
[task]: /docs/job-specification/task 'Nomad task Job Specification'