From 5b4f9dd748893e38604981fc5179cf40a5bfd61e Mon Sep 17 00:00:00 2001 From: vanphan24 <89482663+vanphan24@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:03:57 -0800 Subject: [PATCH 1/4] Update index.mdx - public_addr note for HCP workers Added a note that the public_addr is not needed if connecting to HCP worker in multi-hop sessions --- website/content/docs/configuration/worker/index.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/content/docs/configuration/worker/index.mdx b/website/content/docs/configuration/worker/index.mdx index 24aff48b9b..703543b9f2 100644 --- a/website/content/docs/configuration/worker/index.mdx +++ b/website/content/docs/configuration/worker/index.mdx @@ -62,6 +62,8 @@ worker { useful for cloud environments that do not bind a publicly accessible IP to a NIC on the host directly, such as an Amazon EIP. + This parameter is omitted in multi-hop configuration if this worker connects to an upstream HCP Boundary worker. + This value can reference any of the following: - a direct address string - a file on disk (file://) from which an address will be read From 53e215fbb987e5e1f0962dc21c8d26bd98508f02 Mon Sep 17 00:00:00 2001 From: vanphan24 <89482663+vanphan24@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:40:01 -0800 Subject: [PATCH 2/4] Update index.mdx --- website/content/docs/configuration/worker/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/configuration/worker/index.mdx b/website/content/docs/configuration/worker/index.mdx index 703543b9f2..387346f0a3 100644 --- a/website/content/docs/configuration/worker/index.mdx +++ b/website/content/docs/configuration/worker/index.mdx @@ -62,7 +62,7 @@ worker { useful for cloud environments that do not bind a publicly accessible IP to a NIC on the host directly, such as an Amazon EIP. - This parameter is omitted in multi-hop configuration if this worker connects to an upstream HCP Boundary worker. + This parameter is omitted in multi-hop configurations if this self-managed worker connects to an upstream HCP-managed worker. This value can reference any of the following: - a direct address string From c51de6576cba1a309251eab6be5729058bd6ef17 Mon Sep 17 00:00:00 2001 From: vanphan24 <89482663+vanphan24@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:57:37 -0800 Subject: [PATCH 3/4] Update index.mdx changed to active voice per Robin's suggestion --- website/content/docs/configuration/worker/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/configuration/worker/index.mdx b/website/content/docs/configuration/worker/index.mdx index 387346f0a3..65fe697d39 100644 --- a/website/content/docs/configuration/worker/index.mdx +++ b/website/content/docs/configuration/worker/index.mdx @@ -62,7 +62,7 @@ worker { useful for cloud environments that do not bind a publicly accessible IP to a NIC on the host directly, such as an Amazon EIP. - This parameter is omitted in multi-hop configurations if this self-managed worker connects to an upstream HCP-managed worker. + You should omit this parameter in multi-hop configurations if this self-managed worker connects to an upstream HCP-managed worker. This value can reference any of the following: - a direct address string From bd31b6ff72f75ebdc860d7492792365b9692c52c Mon Sep 17 00:00:00 2001 From: stellarsquall Date: Tue, 26 Nov 2024 11:23:22 -0700 Subject: [PATCH 4/4] fix hcp_boundary_cluster_id note --- website/content/docs/configuration/worker/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/configuration/worker/index.mdx b/website/content/docs/configuration/worker/index.mdx index 65fe697d39..bab243e3e7 100644 --- a/website/content/docs/configuration/worker/index.mdx +++ b/website/content/docs/configuration/worker/index.mdx @@ -77,8 +77,8 @@ worker { using env or file, their contents must formatted as a JSON array: `["127.0.0.1", "192.168.0.1", "10.0.0.1"]` - HCP Boundary workers require the [`hcp_boundary_cluster_id`](/boundary/docs/configuration/worker/#hcp_boundary_cluster_id) parameter instead of `initial upstreams`. - If you configure an HCP worker with `initial_upstreams`, the worker configuration fails. + Self-managed workers connecting to HCP Boundary require the [`hcp_boundary_cluster_id`](/boundary/docs/configuration/worker/#hcp_boundary_cluster_id) parameter instead of `initial upstreams`, unless you are configuring an HCP-managed worker as an ingress worker. + If you configure a self-managed worker with both `initial_upstreams` and `hcp_boundary_cluster_id`, the worker configuration fails. - `hcp_boundary_cluster_id` - A string required to configure workers using worker-led or controller-led registration to connect to your HCP Boundary cluster rather than specifying