From b003393cc5e7bdaa83d019f35f820a9210c22201 Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Wed, 1 Apr 2020 21:18:41 -0400 Subject: [PATCH] connect: set task lifecycle config for injected sidecar task fixes #7593 --- nomad/job_endpoint_hook_connect.go | 4 ++++ website/pages/docs/job-specification/sidecar_task.mdx | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/nomad/job_endpoint_hook_connect.go b/nomad/job_endpoint_hook_connect.go index fca81ef1d..2f3269147 100644 --- a/nomad/job_endpoint_hook_connect.go +++ b/nomad/job_endpoint_hook_connect.go @@ -165,6 +165,10 @@ func newConnectTask(serviceName string) *structs.Task { MaxFileSizeMB: 2, }, Resources: connectSidecarResources(), + Lifecycle: &structs.TaskLifecycleConfig{ + Hook: structs.TaskLifecycleHookPrestart, + Sidecar: true, + }, Constraints: structs.Constraints{ connectVersionConstraint(), }, diff --git a/website/pages/docs/job-specification/sidecar_task.mdx b/website/pages/docs/job-specification/sidecar_task.mdx index 6821cca52..aabda105a 100644 --- a/website/pages/docs/job-specification/sidecar_task.mdx +++ b/website/pages/docs/job-specification/sidecar_task.mdx @@ -61,6 +61,11 @@ The default sidecar task is equivalent to: sidecar_task { name = "connect-proxy-" + lifecycle { + hook = "prestart" + sidecar = true + } + driver = "docker" config { image = "${meta.connect.sidecar_image}"