Skip to content

Commit ae2e7bd

Browse files
author
Christopher Tauchen
committed
Added support for wildcard domains in Image CR
1 parent d3fcf07 commit ae2e7bd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

modules/images-configuration-parameters.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The `image.config.openshift.io/cluster` resource holds cluster-wide information
1717

1818
Every element of this list contains a location of the registry specified by the registry domain name.
1919

20-
`domainName`: Specifies a domain name for the registry. In case the registry uses a non-standard `80` or `443` port, the port should be included in the domain name as well.
20+
`domainName`: Specifies a domain name for the registry. If the registry uses a non-standard `80` or `443` port, the port should be included in the domain name as well.
2121

2222
`insecure`: Insecure indicates whether the registry is secure or insecure. By default, if not otherwise specified, the registry is assumed to be secure.
2323

@@ -33,11 +33,11 @@ The namespace for this config map is `openshift-config`. The format of the confi
3333
|Contains configuration that determines how the container runtime should treat individual registries when accessing images for builds and
3434
pods. For instance, whether or not to allow insecure access. It does not contain configuration for the internal cluster registry.
3535

36-
`insecureRegistries`: Registries which do not have a valid TLS certificate or only support HTTP connections. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`.
36+
`insecureRegistries`: Registries which do not have a valid TLS certificate or only support HTTP connections. To specify all subdomains, add the asterisk (`\*`) wildcard character as a prefix to the domain name. For example, `*.example.com`. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`.
3737

38-
`blockedRegistries`: Registries for which image pull and push actions are denied. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`. All other registries are allowed.
38+
`blockedRegistries`: Registries for which image pull and push actions are denied. To specify all subdomains, add the asterisk (`\*`) wildcard character as a prefix to the domain name. For example, `*.example.com`. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`. All other registries are allowed.
3939

40-
`allowedRegistries`: Registries for which image pull and push actions are allowed. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`. All other registries are blocked.
40+
`allowedRegistries`: Registries for which image pull and push actions are allowed. To specify all subdomains, add the asterisk (`\*`) wildcard character as a prefix to the domain name For example, `*.example.com`. You can specify an individual repository within a registry. For example: `reg1.io/myrepo/myapp:latest`. All other registries are blocked.
4141

4242
`containerRuntimeSearchRegistries`: Registries for which image pull and push actions are allowed using image short names. All other registries are blocked.
4343

0 commit comments

Comments
 (0)