Skip to content

Commit

Permalink
Be less scary, more clear
Browse files Browse the repository at this point in the history
  • Loading branch information
samjetski committed Oct 5, 2023
1 parent 35edeae commit fe5760c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/pages/docs/infrastructure/workers/built-in-worker.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Octopus Server comes with a built-in worker which enables you to conveniently ru
This page describes how to configure the built-in worker for a variety of scenarios.

:::div{.warning}
The built-in worker is disabled on [Octopus Cloud](/docs/octopus-cloud) for security reasons. We recommend using one of the pre-configured [Dynamic Worker Pools](/docs/infrastructure/workers/dynamic-worker-pools).
The built-in worker is only available on [self-hosted Octopus](/docs/getting-started#self-hosted-octopus) instances. [Octopus Cloud](/docs/octopus-cloud) customers have access to [Dynamic Worker Pools](/docs/infrastructure/workers/dynamic-worker-pools), which provide pre-configured Tentacle workers on-demand.
:::

## Built-in Worker
Expand Down
6 changes: 3 additions & 3 deletions src/pages/docs/infrastructure/workers/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ There are two kinds of workers you can use in Octopus:
1. [External workers](#external-workers)

:::div{.success}
[Octopus Cloud](/docs/octopus-cloud) uses [Dynamic Workers](/docs/infrastructure/workers/dynamic-worker-pools) by default, which provides External Workers running on `Ubuntu` or `Windows` VMs. Dynamic Workers are managed by Octopus Cloud, and are included with your Octopus Cloud subscription.
[Octopus Cloud](/docs/octopus-cloud) uses [Dynamic Workers](/docs/infrastructure/workers/dynamic-worker-pools) by default, which provides External Workers running on Ubuntu and Windows VMs. Dynamic Workers are managed by Octopus Cloud, and are included with your Octopus Cloud subscription.
:::

## Ignoring Workers \{#ignoring-workers}
Expand All @@ -72,7 +72,7 @@ Adding a worker to the default worker pool will disable the built-in worker, and
Learn about the security implications and how to configure the [built-in worker](/docs/infrastructure/workers/built-in-worker).

:::div{.warning}
The built-in worker is disabled on [Octopus Cloud](/docs/octopus-cloud) for security reasons. We recommend using one of the pre-configured [Dynamic Worker Pools](/docs/infrastructure/workers/dynamic-worker-pools).
The built-in worker is only available on [self-hosted Octopus](/docs/getting-started#self-hosted-octopus) instances. [Octopus Cloud](/docs/octopus-cloud) customers have access to [Dynamic Worker Pools](/docs/infrastructure/workers/dynamic-worker-pools), which provide pre-configured Tentacle workers on-demand.
:::

## External Workers \{#external-workers}
Expand All @@ -90,7 +90,7 @@ Workers have machine policies, are health checked, and run Calamari, just like d
:::div{.success}
[Octopus Cloud](/docs/octopus-cloud) customers can choose to use the included [Dynamic Worker Pools](/docs/infrastructure/workers/dynamic-worker-pools) (enabled by default), and/or register their own external workers.

Dynamic Workers are on-demand external workers managed by Octopus Cloud, which means you don't need to configure or maintain additional infrastructure. Dynamic Workers provide `Ubuntu` or `Windows` VMs running as pre-configured tentacles.
Dynamic Workers are on-demand external workers managed by Octopus Cloud, which means you don't need to configure or maintain additional infrastructure. Dynamic Workers provide Ubuntu and Windows VMs running as pre-configured tentacles.
:::

## Registering an External Worker \{#registering-an-external-worker}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/docs/infrastructure/workers/worker-pools.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ There is always a default worker pool for each [space](/docs/administration/spac
On [self-hosted Octopus](/docs/getting-started#self-hosted-octopus), an empty `Default Worker Pool` is provided.

- Initially this pool is empty, which means the [built-in worker](/docs/infrastructure/workers/built-in-worker) will be used
- When you add workers to the default worker pool, the built-in worker will be disabled. This means any deployment processes that previously used the built-in worker on the Octopus Server, will automatically move from using the built-in worker to workers in the worker pool.
- When you add workers to the default worker pool, the built-in worker will be disabled. This means any deployment processes that previously used the built-in worker on the Octopus Server will automatically start using workers in the worker pool.

On [Octopus Cloud](/docs/octopus-cloud), the initial default pool is a [dynamic worker pool](/docs/infrastructure/workers/dynamic-worker-pools) using the `Ubuntu (default)` image. A pool using the `Windows (default)` image is also provided.

Expand Down

0 comments on commit fe5760c

Please sign in to comment.