diff --git a/client/allocrunner/taskrunner/connect_native_hook.go b/client/allocrunner/taskrunner/connect_native_hook.go index df74841ef..8adc61137 100644 --- a/client/allocrunner/taskrunner/connect_native_hook.go +++ b/client/allocrunner/taskrunner/connect_native_hook.go @@ -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 { diff --git a/jobspec/parse_service.go b/jobspec/parse_service.go index c0fa09096..f3d56d3d6 100644 --- a/jobspec/parse_service.go +++ b/jobspec/parse_service.go @@ -47,7 +47,7 @@ func parseService(o *ast.ObjectItem) (*api.Service, error) { "address_mode", "check_restart", "connect", - "task", // todo + "task", "meta", "canary_meta", } diff --git a/nomad/structs/services.go b/nomad/structs/services.go index 8d2436450..5367e2731 100644 --- a/nomad/structs/services.go +++ b/nomad/structs/services.go @@ -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)) } } diff --git a/website/pages/docs/configuration/consul.mdx b/website/pages/docs/configuration/consul.mdx index 331619082..09922fb1b 100644 --- a/website/pages/docs/configuration/consul.mdx +++ b/website/pages/docs/configuration/consul.mdx @@ -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` diff --git a/website/pages/docs/job-specification/connect.mdx b/website/pages/docs/job-specification/connect.mdx index 2ece25182..d4869f140 100644 --- a/website/pages/docs/job-specification/connect.mdx +++ b/website/pages/docs/job-specification/connect.mdx @@ -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'