Skip to content

Commit

Permalink
Merge pull request #10740 from bparees/pem
Browse files Browse the repository at this point in the history
document imageimport pem file argument
  • Loading branch information
bmcelvee committed Jul 26, 2018
2 parents 1c0880c + af924f2 commit 7a5f25c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions install_config/master_node_configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,12 @@ permission to create Images or ImageStreamMappings via the API are not affected
this policy - typically only administrators or system integrations will have those
permissions.

|`*AdditionalTrustedCA*`
|Specified a filepath to a PEM-encoded file listing additional certificate authorities
that should be trusted during imagestream import. This file needs to be accessible
to the API server process. Depending how your cluster is installed, this may require
mounting the file into the API server pod.

|`*InternalRegistryHostname*`
|Sets the hostname for the default internal image
registry. The value must be in `*hostname[:port]*` format.
Expand Down

0 comments on commit 7a5f25c

Please sign in to comment.