mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #24929 from thaJeztah/remove-secrets-from-docs
Remove "secrets" leftovers from docs
This commit is contained in:
commit
64e4a40497
4 changed files with 26 additions and 28 deletions
|
@ -3618,11 +3618,6 @@ JSON Parameters:
|
||||||
the networking interface used for the VXLAN Tunnel Endpoint (VTEP).
|
the networking interface used for the VXLAN Tunnel Endpoint (VTEP).
|
||||||
- **ForceNewCluster** – Force creating a new Swarm even if already part of one.
|
- **ForceNewCluster** – Force creating a new Swarm even if already part of one.
|
||||||
- **Spec** – Configuration settings of the new Swarm.
|
- **Spec** – Configuration settings of the new Swarm.
|
||||||
- **Policies** – An array of acceptance policies.
|
|
||||||
- **Role** – The role that policy applies to (`MANAGER` or `WORKER`)
|
|
||||||
- **Autoaccept** – A boolean indicating whether nodes joining for that role should be
|
|
||||||
automatically accepted in the Swarm.
|
|
||||||
- **Secret** – An optional secret to provide for nodes to join the Swarm.
|
|
||||||
- **Orchestration** – Configuration settings for the orchestration aspects of the Swarm.
|
- **Orchestration** – Configuration settings for the orchestration aspects of the Swarm.
|
||||||
- **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
|
- **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
|
||||||
- **Raft** – Raft related configuration.
|
- **Raft** – Raft related configuration.
|
||||||
|
|
|
@ -3619,11 +3619,6 @@ JSON Parameters:
|
||||||
the networking interface used for the VXLAN Tunnel Endpoint (VTEP).
|
the networking interface used for the VXLAN Tunnel Endpoint (VTEP).
|
||||||
- **ForceNewCluster** – Force creating a new Swarm even if already part of one.
|
- **ForceNewCluster** – Force creating a new Swarm even if already part of one.
|
||||||
- **Spec** – Configuration settings of the new Swarm.
|
- **Spec** – Configuration settings of the new Swarm.
|
||||||
- **Policies** – An array of acceptance policies.
|
|
||||||
- **Role** – The role that policy applies to (`MANAGER` or `WORKER`)
|
|
||||||
- **Autoaccept** – A boolean indicating whether nodes joining for that role should be
|
|
||||||
automatically accepted in the Swarm.
|
|
||||||
- **Secret** – An optional secret to provide for nodes to join the Swarm.
|
|
||||||
- **Orchestration** – Configuration settings for the orchestration aspects of the Swarm.
|
- **Orchestration** – Configuration settings for the orchestration aspects of the Swarm.
|
||||||
- **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
|
- **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
|
||||||
- **Raft** – Raft related configuration.
|
- **Raft** – Raft related configuration.
|
||||||
|
|
|
@ -29,12 +29,14 @@ Lists all the nodes that the Docker Swarm manager knows about. You can filter us
|
||||||
|
|
||||||
Example output:
|
Example output:
|
||||||
|
|
||||||
$ docker node ls
|
```bash
|
||||||
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
$ docker node ls
|
||||||
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
|
||||||
38ciaotwjuritcdtn9npbnkuz swarm-worker1 Ready Active
|
|
||||||
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Ready Active Leader
|
|
||||||
|
|
||||||
|
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
||||||
|
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
||||||
|
38ciaotwjuritcdtn9npbnkuz swarm-worker1 Ready Active
|
||||||
|
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Ready Active Leader
|
||||||
|
```
|
||||||
|
|
||||||
## Filtering
|
## Filtering
|
||||||
|
|
||||||
|
@ -53,18 +55,23 @@ The `name` filter matches on all or part of a node name.
|
||||||
|
|
||||||
The following filter matches the node with a name equal to `swarm-master` string.
|
The following filter matches the node with a name equal to `swarm-master` string.
|
||||||
|
|
||||||
$ docker node ls -f name=swarm-manager1
|
```bash
|
||||||
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
$ docker node ls -f name=swarm-manager1
|
||||||
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Ready Active Leader
|
|
||||||
|
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
||||||
|
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Ready Active Leader
|
||||||
|
```
|
||||||
|
|
||||||
### id
|
### id
|
||||||
|
|
||||||
The `id` filter matches all or part of a node's id.
|
The `id` filter matches all or part of a node's id.
|
||||||
|
|
||||||
$ docker node ls -f id=1
|
```bash
|
||||||
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
$ docker node ls -f id=1
|
||||||
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
|
||||||
|
|
||||||
|
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
||||||
|
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
||||||
|
```
|
||||||
|
|
||||||
#### label
|
#### label
|
||||||
|
|
||||||
|
@ -75,6 +82,7 @@ The following filter matches nodes with the `usage` label regardless of its valu
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ docker node ls -f "label=foo"
|
$ docker node ls -f "label=foo"
|
||||||
|
|
||||||
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS
|
||||||
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Ready Active
|
||||||
```
|
```
|
||||||
|
|
|
@ -37,7 +37,7 @@ run your manager node. For example, the tutorial uses a machine named
|
||||||
e216jshn25ckzbvmwlnh5jr3g * manager1 Ready Active Leader
|
e216jshn25ckzbvmwlnh5jr3g * manager1 Ready Active Leader
|
||||||
```
|
```
|
||||||
|
|
||||||
2. If you aren't still running the `redis` service from the [rolling
|
3. If you aren't still running the `redis` service from the [rolling
|
||||||
update](rolling-update.md) tutorial, start it now:
|
update](rolling-update.md) tutorial, start it now:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -46,7 +46,7 @@ update](rolling-update.md) tutorial, start it now:
|
||||||
c5uo6kdmzpon37mgj9mwglcfw
|
c5uo6kdmzpon37mgj9mwglcfw
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Run `docker service tasks redis` to see how the Swarm manager assigned the
|
4. Run `docker service tasks redis` to see how the Swarm manager assigned the
|
||||||
tasks to different nodes:
|
tasks to different nodes:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -61,7 +61,7 @@ tasks to different nodes:
|
||||||
In this case the swarm manager distributed one task to each node. You may
|
In this case the swarm manager distributed one task to each node. You may
|
||||||
see the tasks distributed differently among the nodes in your environment.
|
see the tasks distributed differently among the nodes in your environment.
|
||||||
|
|
||||||
4. Run `docker node update --availability drain <NODE-ID>` to drain a node that
|
5. Run `docker node update --availability drain <NODE-ID>` to drain a node that
|
||||||
had a task assigned to it:
|
had a task assigned to it:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -70,7 +70,7 @@ had a task assigned to it:
|
||||||
worker1
|
worker1
|
||||||
```
|
```
|
||||||
|
|
||||||
5. Inspect the node to check its availability:
|
6. Inspect the node to check its availability:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ docker node inspect --pretty worker1
|
$ docker node inspect --pretty worker1
|
||||||
|
@ -85,7 +85,7 @@ had a task assigned to it:
|
||||||
|
|
||||||
The drained node shows `Drain` for `AVAILABILITY`.
|
The drained node shows `Drain` for `AVAILABILITY`.
|
||||||
|
|
||||||
6. Run `docker service tasks redis` to see how the Swarm manager updated the
|
7. Run `docker service tasks redis` to see how the Swarm manager updated the
|
||||||
task assignments for the `redis` service:
|
task assignments for the `redis` service:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -101,7 +101,7 @@ task assignments for the `redis` service:
|
||||||
with `Drain` availability and creating a new task on a node with `Active`
|
with `Drain` availability and creating a new task on a node with `Active`
|
||||||
availability.
|
availability.
|
||||||
|
|
||||||
7. Run `docker node update --availability active <NODE-ID>` to return the
|
8. Run `docker node update --availability active <NODE-ID>` to return the
|
||||||
drained node to an active state:
|
drained node to an active state:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -110,7 +110,7 @@ drained node to an active state:
|
||||||
worker1
|
worker1
|
||||||
```
|
```
|
||||||
|
|
||||||
8. Inspect the node to see the updated state:
|
9. Inspect the node to see the updated state:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ docker node inspect --pretty worker1
|
$ docker node inspect --pretty worker1
|
||||||
|
|
Loading…
Add table
Reference in a new issue