Skip to content

Commit f0efce9

Browse files
tgrossfredrikhgrelland
authored andcommitted
docs: inclusive language configuration changes (hashicorp#9069)
1 parent d17a976 commit f0efce9

File tree

7 files changed

+52
-35
lines changed

7 files changed

+52
-35
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ IMPROVEMENTS:
99
* client: Use ec2 CPU perf data from AWS API [[GH-7830](https://github.com/hashicorp/nomad/issues/7830)]
1010
* client: Added support for Azure fingerprinting. [[GH-8979](https://github.com/hashicorp/nomad/issues/8979)]
1111
* client: Added support for fingerprinting the client node's Consul segment. [[GH-7214](https://github.com/hashicorp/nomad/issues/7214)]
12-
* client: Updated consul-template to v0.25.0 - config function_blacklist deprecated and replaced with function_denylist [[GH-8988](https://github.com/hashicorp/nomad/pull/8988)]
12+
* client: Updated consul-template to v0.25.0 - config `function_blacklist` deprecated and replaced with `function_denylist` [[GH-8988](https://github.com/hashicorp/nomad/pull/8988)]
13+
* config: Deprecated terms `blacklist` and `whitelist` from configuration and replaced them with `denylist` and `allowlist`. [[GH-9019](https://github.com/hashicorp/nomad/issues/9019)]
1314
* consul: Support Consul namespace (Consul Enterprise) in client configuration. [[GH-8849](https://github.com/hashicorp/nomad/pull/8849)]
1415
* csi: Relaxed validation requirements when checking volume capabilities with controller plugins, to accommodate existing plugin behaviors. [[GH-9049](https://github.com/hashicorp/nomad/issues/9049)]
1516
* driver/docker: Upgrade pause container and detect architecture [[GH-8957](https://github.com/hashicorp/nomad/pull/8957)]

website/pages/docs/configuration/client.mdx

+20-20
Original file line numberDiff line numberDiff line change
@@ -199,32 +199,32 @@ The following is not an exhaustive list of options for only the Nomad
199199
client. To find the options supported by each individual Nomad driver, please
200200
see the [drivers documentation](/docs/drivers).
201201

202-
- `"driver.whitelist"` `(string: "")` - Specifies a comma-separated list of
203-
whitelisted drivers . If specified, drivers not in the whitelist will be
204-
disabled. If the whitelist is empty, all drivers are fingerprinted and enabled
202+
- `"driver.allowlist"` `(string: "")` - Specifies a comma-separated list of
203+
allowlisted drivers . If specified, drivers not in the allowlist will be
204+
disabled. If the allowlist is empty, all drivers are fingerprinted and enabled
205205
where applicable.
206206

207207
```hcl
208208
client {
209209
options = {
210-
"driver.whitelist" = "docker,qemu"
210+
"driver.allowlist" = "docker,qemu"
211211
}
212212
}
213213
```
214214

215-
- `"driver.blacklist"` `(string: "")` - Specifies a comma-separated list of
216-
blacklisted drivers . If specified, drivers in the blacklist will be
215+
- `"driver.denylist"` `(string: "")` - Specifies a comma-separated list of
216+
denylisted drivers . If specified, drivers in the denylist will be
217217
disabled.
218218

219219
```hcl
220220
client {
221221
options = {
222-
"driver.blacklist" = "docker,qemu"
222+
"driver.denylist" = "docker,qemu"
223223
}
224224
}
225225
```
226226

227-
- `"env.blacklist"` `(string: see below)` - Specifies a comma-separated list of
227+
- `"env.denylist"` `(string: see below)` - Specifies a comma-separated list of
228228
environment variable keys not to pass to these tasks. Nomad passes the host
229229
environment variables to `exec`, `raw_exec` and `java` tasks. If specified,
230230
the defaults are overridden. If a value is provided, **all** defaults are
@@ -233,7 +233,7 @@ see the [drivers documentation](/docs/drivers).
233233
```hcl
234234
client {
235235
options = {
236-
"env.blacklist" = "MY_CUSTOM_ENVVAR"
236+
"env.denylist" = "MY_CUSTOM_ENVVAR"
237237
}
238238
}
239239
```
@@ -250,15 +250,15 @@ see the [drivers documentation](/docs/drivers).
250250
GOOGLE_APPLICATION_CREDENTIALS
251251
```
252252

253-
- `"user.blacklist"` `(string: see below)` - Specifies a comma-separated
254-
blacklist of usernames for which a task is not allowed to run. This only
253+
- `"user.denylist"` `(string: see below)` - Specifies a comma-separated
254+
denylist of usernames for which a task is not allowed to run. This only
255255
applies if the driver is included in `"user.checked_drivers"`. If a value is
256256
provided, **all** defaults are overridden (they are not merged).
257257

258258
```hcl
259259
client {
260260
options = {
261-
"user.blacklist" = "root,ubuntu"
261+
"user.denylist" = "root,ubuntu"
262262
}
263263
}
264264
```
@@ -271,7 +271,7 @@ see the [drivers documentation](/docs/drivers).
271271
```
272272

273273
- `"user.checked_drivers"` `(string: see below)` - Specifies a comma-separated
274-
list of drivers for which to enforce the `"user.blacklist"`. For drivers using
274+
list of drivers for which to enforce the `"user.denylist"`. For drivers using
275275
containers, this enforcement is usually unnecessary. If a value is provided,
276276
**all** defaults are overridden (they are not merged).
277277

@@ -291,27 +291,27 @@ see the [drivers documentation](/docs/drivers).
291291
java
292292
```
293293

294-
- `"fingerprint.whitelist"` `(string: "")` - Specifies a comma-separated list of
295-
whitelisted fingerprinters. If specified, any fingerprinters not in the
296-
whitelist will be disabled. If the whitelist is empty, all fingerprinters are
294+
- `"fingerprint.allowlist"` `(string: "")` - Specifies a comma-separated list of
295+
allowlisted fingerprinters. If specified, any fingerprinters not in the
296+
allowlist will be disabled. If the allowlist is empty, all fingerprinters are
297297
used.
298298

299299
```hcl
300300
client {
301301
options = {
302-
"fingerprint.whitelist" = "network"
302+
"fingerprint.allowlist" = "network"
303303
}
304304
}
305305
```
306306

307-
- `"fingerprint.blacklist"` `(string: "")` - Specifies a comma-separated list of
308-
blacklisted fingerprinters. If specified, any fingerprinters in the blacklist
307+
- `"fingerprint.denylist"` `(string: "")` - Specifies a comma-separated list of
308+
denylisted fingerprinters. If specified, any fingerprinters in the denylist
309309
will be disabled.
310310

311311
```hcl
312312
client {
313313
options = {
314-
"fingerprint.blacklist" = "network"
314+
"fingerprint.denylist" = "network"
315315
}
316316
}
317317
```

website/pages/docs/drivers/docker.mdx

+7-7
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ The `docker` driver supports the following configuration in the job spec. Only
377377

378378
- `cap_add` - (Optional) A list of Linux capabilities as strings to pass directly to
379379
[`--cap-add`](https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities).
380-
Effective capabilities (computed from `cap_add` and `cap_drop`) have to match the configured whitelist.
381-
The whitelist can be customized using the [`allow_caps`](#plugin_caps) plugin option key in the client node's configuration.
380+
Effective capabilities (computed from `cap_add` and `cap_drop`) have to match the configured allowlist.
381+
The allowlist can be customized using the [`allow_caps`](#plugin_caps) plugin option key in the client node's configuration.
382382
For example:
383383

384384
```hcl
@@ -391,8 +391,8 @@ The `docker` driver supports the following configuration in the job spec. Only
391391

392392
- `cap_drop` - (Optional) A list of Linux capabilities as strings to pass directly to
393393
[`--cap-drop`](https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities).
394-
Effective capabilities (computed from `cap_add` and `cap_drop`) have to match the configured whitelist.
395-
The whitelist can be customized using the [`allow_caps`](#plugin_caps) plugin option key in the client node's configuration.
394+
Effective capabilities (computed from `cap_add` and `cap_drop`) have to match the configured allowlist.
395+
The allowlist can be customized using the [`allow_caps`](#plugin_caps) plugin option key in the client node's configuration.
396396
For example:
397397

398398
```hcl
@@ -750,7 +750,7 @@ plugin "docker" {
750750
`CHOWN,DAC_OVERRIDE,FSETID,FOWNER,MKNOD,NET_RAW,SETGID,SETUID,SETFCAP,SETPCAP, NET_BIND_SERVICE,SYS_CHROOT,KILL,AUDIT_WRITE` which is the list of
751751
capabilities allowed by docker by default, as defined here. Allows the
752752
operator to control which capabilities can be obtained by tasks using cap_add
753-
and cap_drop options. Supports the value "ALL" as a shortcut for whitelisting
753+
and cap_drop options. Supports the value "ALL" as a shortcut for allowlisting
754754
all capabilities.
755755

756756
- `allow_runtimes` - defaults to `["runc", "nvidia"]` - A list of the allowed
@@ -896,13 +896,13 @@ options](/docs/configuration/client#options):
896896
access to the host's devices. Note that you must set a similar setting on the
897897
Docker daemon for this to work.
898898

899-
- `docker.caps.whitelist`: A list of allowed Linux capabilities. Defaults to
899+
- `docker.caps.allowlist`: A list of allowed Linux capabilities. Defaults to
900900
`"CHOWN,DAC_OVERRIDE,FSETID,FOWNER,MKNOD,NET_RAW,SETGID,SETUID,SETFCAP, SETPCAP,NET_BIND_SERVICE,SYS_CHROOT,KILL,AUDIT_WRITE"`, which is the list of
901901
capabilities allowed by docker by default, as [defined
902902
here](https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities).
903903
Allows the operator to control which capabilities can be obtained by tasks
904904
using `cap_add` and `cap_drop` options. Supports the value `"ALL"` as a
905-
shortcut for whitelisting all capabilities.
905+
shortcut for allowlisting all capabilities.
906906

907907
- `docker.cleanup.container`: Defaults to `true`. This option can be used to
908908
disable Nomad from removing a container when the task exits. Under a name

website/pages/docs/integrations/vault-integration.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Vault's [Token Authentication Backend][auth] supports a concept called "roles".
5050
Token roles allow policies to be grouped together and token creation to be
5151
delegated to a trusted service such as Nomad. By creating a token role, the set
5252
of policies that tasks managed by Nomad can access may be limited compared to
53-
giving Nomad a root token. Token roles allow both white-list and blacklist
53+
giving Nomad a root token. Token roles allow both allowlist and denylist
5454
management of policies accessible to the role.
5555

5656
To configure Nomad and Vault to create tokens against a role, the following must
@@ -129,13 +129,13 @@ $ vault policy write nomad-server nomad-server-policy.hcl
129129

130130
A Vault token role must be created for use by Nomad. The token role can be used
131131
to manage what Vault policies are accessible by jobs submitted to Nomad. The
132-
policies can be managed as a whitelist by using `allowed_policies` in the token
133-
role definition or as a blacklist by using `disallowed_policies`.
132+
policies can be managed as a allowlist by using `allowed_policies` in the token
133+
role definition or as a denylist by using `disallowed_policies`.
134134

135135
If using `allowed_policies`, tasks may only request Vault policies that are in
136136
the list. If `disallowed_policies` is used, task may request any policy that is
137137
not in the `disallowed_policies` list. There are trade-offs to both approaches
138-
but generally it is easier to use the blacklist approach and add policies that
138+
but generally it is easier to use the denylist approach and add policies that
139139
you would not like tasks to have access to into the `disallowed_policies` list.
140140

141141
An example token role definition is given below:

website/pages/docs/internals/security.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ environment.
191191
kernel for other containers and the Nomad client agent itself. Docker driver
192192
allows [customizing runtimes](/docs/drivers/docker#runtime).
193193

194-
- **[Disable Unused Drivers](/docs/configuration/client#driver-blacklist)** -
194+
- **[Disable Unused Drivers](/docs/configuration/client#driver-denylist)** -
195195
Each driver provides different degrees of isolation, and bugs may allow
196196
unintended privilege escalation. If a task driver is not needed, you can
197197
disable it to reduce risk.

website/pages/docs/job-specification/task.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ job "docs" {
9696
[Docker][] and [rkt][] images specify their own default users. This can only
9797
be set on Linux platforms, and clients can restrict
9898
[which drivers][user_drivers] are allowed to run tasks as
99-
[certain users][user_blacklist].
99+
[certain users][user_denylist].
100100

101101
- `template` <code>([Template][]: nil)</code> - Specifies the set of templates
102102
to render for the task. Templates can be used to inject both static and
@@ -213,6 +213,6 @@ task "server" {
213213
[service_discovery]: /docs/integrations/consul-integration#service-discovery 'Nomad Service Discovery'
214214
[template]: /docs/job-specification/template 'Nomad template Job Specification'
215215
[user_drivers]: /docs/configuration/client#user-checked_drivers
216-
[user_blacklist]: /docs/configuration/client#user-blacklist
216+
[user_denylist]: /docs/configuration/client#user-denylist
217217
[max_kill]: /docs/configuration/client#max_kill_timeout
218218
[kill_signal]: /docs/job-specification/task#kill_signal

website/pages/docs/upgrade/upgrade-specific.mdx

+16
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,22 @@ the AWS fingerprinter no longer sets the `cpu.modelname` attribute.
4444
As before, `cpu_total_compute` can be used to override the discovered CPU resources
4545
available to the Nomad client.
4646

47+
### Inclusive language
48+
49+
Starting with Nomad v0.13.0, the terms `blacklist` and `whitelist` have been
50+
deprecated from client configuration and driver configuration. The existing
51+
configuration values are permitted but will be removed in a future version of
52+
Nomad. The specific configuration values replaced are:
53+
54+
* Client `driver.blacklist` is replaced with `driver.denylist`.
55+
* Client `driver.whitelist` is replaced with `driver.allowlist`.
56+
* Client `env.blacklist` is replaced with `env.denylist`.
57+
* Client `fingerprint.blacklist` is replaced with `fingerprint.denylist`.
58+
* Client `fingerprint.whitelist` is replaced with `fingerprint.allowlist`.
59+
* Client `user.blacklist` is replaced with `user.denylist`.
60+
* Client `template.function_blacklist` is replaced with `template.function_denylist`.
61+
* Docker driver `docker.caps.whitelist` is replaced with `docker.caps.allowlist`.
62+
4763
## Nomad 0.12.0
4864

4965
### `mbits` and Task Network Resource deprecation

0 commit comments

Comments
 (0)