From 87af5dec787cd933b4ac8d22ac872f35408e266d Mon Sep 17 00:00:00 2001 From: Mike Noordermeer Date: Mon, 10 May 2021 14:27:22 +0200 Subject: [PATCH] docs: clarify that a default update strategy is used when update strategy is omitted --- website/content/docs/job-specification/group.mdx | 4 ++++ website/content/docs/job-specification/job.mdx | 2 +- website/content/docs/job-specification/update.mdx | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/website/content/docs/job-specification/group.mdx b/website/content/docs/job-specification/group.mdx index 509124a2aa7..488f3f062b2 100644 --- a/website/content/docs/job-specification/group.mdx +++ b/website/content/docs/job-specification/group.mdx @@ -99,6 +99,9 @@ job "docs" { within this group. This can be specified multiple times, to add a task as part of the group. +- `update` ([Update][update]: nil) - Specifies the task's update + strategy. When omitted, a default update strategy is applied. + - `vault` ([Vault][]: nil) - Specifies the set of Vault policies required by all tasks in this group. Overrides a `vault` block set at the `job` level. @@ -268,5 +271,6 @@ group "second" { [restart]: /docs/job-specification/restart 'Nomad restart Job Specification' [service]: /docs/job-specification/service 'Nomad service Job Specification' [service_discovery]: /docs/integrations/consul-integration#service-discovery 'Nomad Service Discovery' +[update]: /docs/job-specification/update 'Nomad update Job Specification' [vault]: /docs/job-specification/vault 'Nomad vault Job Specification' [volume]: /docs/job-specification/volume 'Nomad volume Job Specification' diff --git a/website/content/docs/job-specification/job.mdx b/website/content/docs/job-specification/job.mdx index 421e0919178..8dd73615de3 100644 --- a/website/content/docs/job-specification/job.mdx +++ b/website/content/docs/job-specification/job.mdx @@ -116,7 +116,7 @@ job "docs" { use. Nomad provides the `service`, `system` and `batch` schedulers. - `update` ([Update][update]: nil) - Specifies the task's update - strategy. When omitted, rolling updates are disabled. + strategy. When omitted, a default update strategy is applied. - `vault` ([Vault][]: nil) - Specifies the set of Vault policies required by all tasks in this job. diff --git a/website/content/docs/job-specification/update.mdx b/website/content/docs/job-specification/update.mdx index 6f46fe87f5a..7f60857d9a0 100644 --- a/website/content/docs/job-specification/update.mdx +++ b/website/content/docs/job-specification/update.mdx @@ -4,7 +4,7 @@ page_title: update Stanza - Job Specification description: |- The "update" stanza specifies the group's update strategy. The update strategy is used to control things like rolling upgrades and canary deployments. If - omitted, rolling updates and canaries are disabled. + omitted, a default update strategy is applied. --- # `update` Stanza @@ -18,7 +18,7 @@ description: |- The `update` stanza specifies the group's update strategy. The update strategy is used to control things like [rolling upgrades][rolling] and [canary -deployments][canary]. If omitted, rolling updates and canaries are disabled. If +deployments][canary]. If omitted, a default update strategy is applied. If specified at the job level, the configuration will apply to all groups within the job. If multiple `update` stanzas are specified, they are merged with the group stanza taking the highest precedence and then the job.