Skip to content

Commit d678c1b

Browse files
authored
Merge pull request #28308 from mburke5678/BZ-1871779
registrySources is listed twice in the configuration parameters
2 parents 1399be7 + 6c0964a commit d678c1b

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

modules/images-configuration-parameters.adoc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,17 @@ The namespace for this ConfigMap is `openshift-config`. The format of the
4141
ConfigMap is to use the registry hostname as the key, and the PEM-encoded
4242
certificate as the value, for each additional registry CA to trust.
4343

44-
|`registrySources`
45-
|`registrySources`: Contains configuration that determines how the container
46-
runtime should treat individual registries when accessing images for builds and
47-
pods. For instance, whether or not to allow insecure access. It does not contain
48-
configuration for the internal cluster registry.
49-
5044
|`externalRegistryHostnames`
5145
|`externalRegistryHostnames`: Provides the hostnames for the default external
5246
image registry. The external hostname should be set only when the image registry
5347
is exposed externally. The first value is used in `publicDockerImageRepository`
5448
field in ImageStreams. The value must be in `hostname[:port]` format.
5549

5650
|`registrySources`
57-
|Holds cluster-wide information about how to handle the registries config.
51+
|`registrySources`: Contains configuration that determines how the container
52+
runtime should treat individual registries when accessing images for builds and
53+
pods. For instance, whether or not to allow insecure access. It does not contain
54+
configuration for the internal cluster registry.
5855

5956
`insecureRegistries`: Registries which do not have a valid TLS certificate or
6057
only support HTTP connections.
@@ -71,7 +68,7 @@ Either `blockedRegistries` or `allowedRegistries` can be set, but not both.
7168

7269
[WARNING]
7370
====
74-
When the `allowedRegistries` parameter is defined, all registries including `registry.redhat.io` and `quay.io` are blocked unless explicitly listed. If using the parameter, declare source registries `registry.redhat.io` and `quay.io` as required by payload images within your environment, to prevent Pod failure. For disconnected clusters, mirror registries should also be added.
71+
When the `allowedRegistries` parameter is defined, all registries including `registry.redhat.io` and `quay.io` are blocked unless explicitly listed. If using the parameter, declare source registries `registry.redhat.io` and `quay.io` as required by payload images within your environment, to prevent pod failure. For disconnected clusters, mirror registries should also be added.
7572
====
7673

7774
The `status` field of the `image.config.openshift.io/cluster` resource holds

0 commit comments

Comments
 (0)