Skip to content

Commit a4de642

Browse files
authored
Merge pull request #35810 from bergerhoffer/updating-hostname
Updating instances of 'host name' to 'hostname'
2 parents 2c0849a + 7df910f commit a4de642

File tree

61 files changed

+538
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+538
-542
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ control-plane-3.example.com Ready master 41m v1.19.0+9f84db3
408408

409409
[NOTE]
410410
====
411-
Some provider-formatted host names include IPv4 addresses. An OpenShift Container Platform node name typically reflects the host name of a node. If node names in your output need to be provider-specific and require this format, use private IPv4 addresses. For example, you could use `ip-10-0-48-9.example.com` as a node name that includes a private IPv4 address.
411+
Some provider-formatted hostnames include IPv4 addresses. An OpenShift Container Platform node name typically reflects the hostname of a node. If node names in your output need to be provider-specific and require this format, use private IPv4 addresses. For example, you could use `ip-10-0-48-9.example.com` as a node name that includes a private IPv4 address.
412412
====
413413

414414
== IP addresses

contributing_to_docs/term_glossary.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ A service account binds together:
641641
Usage: SkyDNS
642642

643643
Component of the Kubernetes control plane or OpenShift control plane that provides
644-
cluster-wide DNS resolution of internal host names for services and pods.
644+
cluster-wide DNS resolution of internal hostnames for services and pods.
645645

646646
''''
647647
=== Source-to-Image (S2I)

modules/accessing-hosts-on-aws.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ API is responsive, run privileged pods instead.
3838
====
3939

4040
. Run `oc get nodes`, inspect the output, and choose one of the nodes that is a
41-
master. The host name looks similar to `ip-10-0-1-163.ec2.internal`.
41+
master. The hostname looks similar to `ip-10-0-1-163.ec2.internal`.
4242

4343
. From the bastion SSH host you manually deployed into Amazon EC2, SSH into that
4444
control plane host (also known as the master host). Ensure that you use the same SSH key you specified during the

modules/auth-allowing-javascript-access-api-server.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
The default {product-title} configuration only allows the web console to send requests to the API server.
99

1010
If you need to access the API server or OAuth server from a JavaScript
11-
application using a different host name, you can configure additional host names
11+
application using a different hostname, you can configure additional hostnames
1212
to allow.
1313

1414
.Prerequisites
@@ -25,7 +25,7 @@ $ oc edit apiserver.config.openshift.io cluster
2525
----
2626
+
2727
. Add the `additionalCORSAllowedOrigins` field under the `spec` section and
28-
specify one or more additional host names:
28+
specify one or more additional hostnames:
2929
+
3030
[source,yaml]
3131
----
@@ -44,7 +44,7 @@ spec:
4444
additionalCORSAllowedOrigins:
4545
- (?i)//my\.subdomain\.domain\.com(:|\z) <1>
4646
----
47-
<1> The host name is specified as a link:https://github.com/google/re2/wiki/Syntax[Golang regular expression] that matches
47+
<1> The hostname is specified as a link:https://github.com/google/re2/wiki/Syntax[Golang regular expression] that matches
4848
against CORS headers from HTTP requests against the API server and OAuth server.
4949
+
5050
[NOTE]

modules/cluster-logging-collector-legacy-fluentd.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ To configure {product-title} to forward logs using the legacy Fluentd method:
9595
----
9696
<1> Enter the shared key between nodes.
9797
<2> Specify `tls` to enable TLS validation.
98-
<3> Set to `true` to verify the server cert host name. Set to `false` to ignore server cert host name.
98+
<3> Set to `true` to verify the server cert hostname. Set to `false` to ignore server cert hostname.
9999
<4> Specify the path to the private CA certificate file as `/etc/ocp-forward/ca_cert.pem`.
100100
<5> Specify the link:https://docs.fluentd.org/configuration/buffer-section[Fluentd buffer parameters] as needed.
101101
<6> Optionally, enter a name for this server.
102-
<7> Specify the host name or IP of the server.
102+
<7> Specify the hostname or IP of the server.
103103
<8> Specify the host label of the server.
104104
<9> Specify the port of the server.
105105
<10> Optionally, add additional servers.

modules/configuring-firewall.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ There are no special configuration considerations for services running on only c
3939

4040
|===
4141
+
42-
When you add a site, such as `quay.io`, to your allowlist, do not add a wildcard entry, such as `*.quay.io`, to your denylist. In most cases, image registries use a content delivery network (CDN) to serve images. If a firewall blocks access, then image downloads are denied when the initial download request is redirected to a host name such as `cdn01.quay.io`.
42+
When you add a site, such as `quay.io`, to your allowlist, do not add a wildcard entry, such as `*.quay.io`, to your denylist. In most cases, image registries use a content delivery network (CDN) to serve images. If a firewall blocks access, then image downloads are denied when the initial download request is redirected to a hostname such as `cdn01.quay.io`.
4343
+
44-
CDN host names, such as `cdn01.quay.io`, are covered when you add a wildcard entry, such as `*.quay.io`, in your allowlist.
44+
CDN hostnames, such as `cdn01.quay.io`, are covered when you add a wildcard entry, such as `*.quay.io`, in your allowlist.
4545

4646
. Allowlist any site that provides resources for a language or framework that your builds require.
4747

@@ -144,7 +144,7 @@ the routes work. If you are the cluster administrator and do not want to allow
144144
`*.apps.<cluster_name>.<base_domain>`, then allow these routes:
145145
+
146146
* `oauth-openshift.apps.<cluster_name>.<base_domain>`
147-
* `console-openshift-console.apps.<cluster_name>.<base_domain>`, or the host name
147+
* `console-openshift-console.apps.<cluster_name>.<base_domain>`, or the hostname
148148
that is specified in the `spec.route.hostname` field of the
149149
`consoles.operator/cluster` object if the field is not empty.
150150

modules/dedicated-configuring-your-application-routes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ service externally, you must create a new route with a specific label,
3737
`route=external`.
3838
3939
To expose a new route for an existing service, apply the label `route=external`
40-
and define a host name that contains the secondary, public router shard ID:
40+
and define a hostname that contains the secondary, public router shard ID:
4141
4242
----
4343
$ oc expose service <service-name> -l route=external --name=<custom-route-name> --hostname=<custom-hostname>.<shard-id>.<cluster-id>.openshiftapps.com

modules/identity-provider-github-CR.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ application]. The application must be configured with a callback URL of
4848
`\https://oauth-openshift.apps.<cluster-name>.<cluster-domain>/oauth2callback/<idp-provider-name>`.
4949
<5> Reference to an {product-title} `Secret` object containing the client secret
5050
issued by GitHub.
51-
<6> For GitHub Enterprise, you must provide the host name of your instance, such as
51+
<6> For GitHub Enterprise, you must provide the hostname of your instance, such as
5252
`example.com`. This value must match the GitHub Enterprise `hostname` value in
5353
in the `/setup/settings` file and cannot include a port number. If this
5454
value is not set, then either `teams` or `organizations` must be defined.

modules/images-configuration-cas.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The `image.config.openshift.io/cluster` custom resource can contain a reference
1616

1717
You can create a config map in the `openshift-config` namespace and use its name in `AdditionalTrustedCA` in the `image.config.openshift.io` custom resource to provide additional CAs that should be trusted when contacting external registries.
1818

19-
The config map key is the host name of a registry with the port for which this CA is to be trusted, and the base64-encoded certificate is the value, for each additional registry CA to trust.
19+
The config map key is the hostname of a registry with the port for which this CA is to be trusted, and the base64-encoded certificate is the value, for each additional registry CA to trust.
2020

2121
.Image registry CA config map example
2222
[source,yaml]

modules/images-configuration-parameters.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Every element of this list contains a location of the registry specified by the
2727
The namespace for this config map is `openshift-config`. The format of the config map is to use the registry hostname as the key, and the PEM-encoded certificate as the value, for each additional registry CA to trust.
2828

2929
|`externalRegistryHostnames`
30-
|Provides the host names for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in `publicDockerImageRepository` field in image streams. The value must be in `hostname[:port]` format.
30+
|Provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in `publicDockerImageRepository` field in image streams. The value must be in `hostname[:port]` format.
3131

3232
|`registrySources`
3333
|Contains configuration that determines how the container runtime should treat individual registries when accessing images for builds and
@@ -60,6 +60,6 @@ The `status` field of the `image.config.openshift.io/cluster` resource holds obs
6060
|Set by the Image Registry Operator, which controls the `internalRegistryHostname`. It sets the hostname for the default internal image registry. The value must be in `hostname[:port]` format. For backward compatibility, you can still use the `OPENSHIFT_DEFAULT_REGISTRY` environment variable, but this setting overrides the environment variable.
6161

6262
|`externalRegistryHostnames`
63-
|Set by the Image Registry Operator, provides the external host names for the image registry when it is exposed externally. The first value is used in `publicDockerImageRepository` field in image streams. The values must be in `hostname[:port]` format.
63+
|Set by the Image Registry Operator, provides the external hostnames for the image registry when it is exposed externally. The first value is used in `publicDockerImageRepository` field in image streams. The values must be in `hostname[:port]` format.
6464

6565
|===

0 commit comments

Comments
 (0)