Skip to content

Commit 4162623

Browse files
authored
Merge pull request #13402 from bmcelvee/osdocs-227-registry-options
osdocs-227 registry options modules
2 parents 39ceda2 + b205496 commit 4162623

6 files changed

+159
-3
lines changed

_topic_map.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Distros: openshift-*
6363
Topics:
6464
- Name: Architecture
6565
File: architecture
66-
---
66+
---
6767
Name: Authentication
6868
Dir: authentication
6969
Distros: openshift-*
@@ -113,8 +113,8 @@ Topics:
113113
File: using-service-accounts-as-oauth-client
114114
- Name: Scoping tokens
115115
File: tokens-scoping
116-
- Name: Managing Security Context Constraints
117-
File: managing-security-context-constraints
116+
- Name: Managing Security Context Constraints
117+
File: managing-security-context-constraints
118118
---
119119
Name: Users and roles
120120
Dir: users_and_roles
@@ -143,6 +143,13 @@ Topics:
143143
- Name: Using cookies to keep route statefulness
144144
File: using-cookies-to-keep-route-statefulness
145145
---
146+
Name: Registry
147+
Dir: registry
148+
Distros: openshift-*
149+
Topics:
150+
- Name: Registry options
151+
File: registry-options
152+
---
146153
Name: Scalability and performance
147154
Dir: scalability_and_performance
148155
Distros: openshift-origin, openshift-enterprise
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * assembly/registry
4+
5+
[id='registry-authentication-enabled-registry-overview-{context}']
6+
= Authentication enabled Red Hat registry
7+
8+
All container images available through the Red Hat Container Catalog are hosted
9+
on an image registry, `registry.access.redhat.com`. With {product-title} 3.11
10+
Red Hat Container Catalog moved from `registry.access.redhat.com` to
11+
`registry.redhat.io`.
12+
13+
The new registry, `registry.redhat.io`, requires authentication for access to
14+
images and hosted content on {product-title}. Following the move to the new
15+
registry, the existing registry will be available for a period of time.
16+
17+
[NOTE]
18+
====
19+
{product-title} pulls images from `registry.redhat.io`, so you must configure
20+
your cluster to use it.
21+
====
22+
23+
The new registry uses standard OAuth mechanisms for authentication,
24+
with the following methods:
25+
26+
* *Authentication token.* Tokens, which are generated by administrators,
27+
are service accounts that give systems the ability to authenticate against the
28+
container image registry.
29+
Service accounts are not affected by changes in user accounts, so the token
30+
authentication method is reliable and resilient. This is the only supported
31+
authentication option for production clusters.
32+
* *Web username and password.* This is the standard set of credentials you use
33+
to log in to resources such as `access.redhat.com`.
34+
While it is possible to use this authentication method with {product-title}, it is not supported for
35+
production deployments. Restrict this authentication method to
36+
stand-alone projects outside {product-title}.
37+
38+
You can use `docker login` with your credentials, either username and password
39+
or authentication token, to access content on the new registry.
40+
41+
All image streams point to the new registry. Because the new registry requires
42+
authentication for access, there is a new secret in the OpenShift namespace
43+
called `imagestreamsecret`.
44+
45+
You must place your credentials in two places:
46+
47+
* *OpenShift namespace*. Your credentials must exist in the OpenShift
48+
namespace so that the image streams in the OpenShift namespace can import.
49+
* *Your host*. Your credentials must exist on your host because Kubernetes
50+
uses the credentials from your host when it goes to pull images.
51+
52+
To access the new registry:
53+
54+
* Verify image import secret, `imagestreamsecret`, is in your OpenShift
55+
namespace. That secret has credentials that allow you to access
56+
the new registry.
57+
* Verify all of your cluster nodes have a `/var/lib/origin/.docker/config.json`,
58+
copied from master, that allows you to access the Red Hat registry.
59+
60+
//.Additional resources
61+
//* link:https://access.redhat.com/terms-based-registry[Authentication tokens]
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * assembly/registry
4+
5+
[id='registry-integrated-openshift-registry-{context}']
6+
= Integrated {product-title} registry
7+
8+
{product-title} provides an integrated container image registry called
9+
_{product-title} Container Registry_ (OCR) that adds the ability to automatically
10+
provision new image repositories on demand. This provides users with a built-in
11+
location for their application builds to push the resulting images.
12+
13+
Whenever a new image is pushed to OCR, the registry notifies {product-title}
14+
about the new image, passing along all the information about it, such as the
15+
namespace, name, and image metadata. Different pieces of {product-title} react
16+
to new images, creating new builds and deployments.
17+
18+
OCR can also be deployed as a stand-alone component that acts solely as a
19+
container image registry, without the build and deployment integration. See
20+
Installing a Stand-alone Deployment of {product-title} Container Registry for
21+
details.

modules/registry-quay-overview.adoc

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * assembly/registry
4+
5+
[id='registry-quay-overview-{context}']
6+
= Red Hat Quay registries
7+
8+
If you need an enterprise-quality container image registry, Red Hat Quay is
9+
available both as a hosted service and as software you can install in your own
10+
data center or cloud environment. Advanced registry features in Red Hat Quay
11+
include geo-replication, image scanning, and the ability to roll back images.
12+
13+
Visit the Quay.io site to set up your own hosted Quay registry account. After
14+
that, follow the Quay Tutorial to log in to the Quay registry and start managing
15+
your images.
16+
17+
You can access your Red Hat Quay registry from {product-title} like any remote
18+
container image registry.
19+
20+
//.Additional resources
21+
//* link:https://quay.io[Quay.io]
22+
//* link:https://quay.io/tutorial/[Quay Tutorial]
23+
//* Refer to link:https://access.redhat.com/documentation/en-us/red_hat_quay/2.9/html-single/getting_started_with_red_hat_quay/[Getting Started with Red Hat Quay]
24+
//for information about setting up your own Red Hat Quay registry.
25+
//* To learn how to set up credentials to access
26+
//Red Hat Quay as a secured registry, refer to xref:../../dev_guide/managing_images.adoc#allowing-pods-to-reference-images-from-other-secured-registries[Allowing Pods to Reference Images from Other Secured Registries].
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * assembly/registry
4+
5+
[id='registry-third-party-registries-{context}']
6+
= Third party registries
7+
8+
{product-title} can create containers using images from third party registries,
9+
but it is unlikely that these registries offer the same image notification
10+
support as the integrated {product-title} registry. In this situation
11+
{product-title} will fetch tags from the remote registry upon imagestream
12+
creation.
13+
14+
Refreshing the fetched tags is as simple as running `oc import-image
15+
<stream>`. When new images are detected, the previously-described build and
16+
deployment reactions occur.
17+
18+
== Authentication
19+
{product-title} can communicate with registries to access private image
20+
repositories using credentials supplied by the user. This allows {product-title}
21+
to push and pull images to and from private repositories.
22+
23+
//.Additional resources
24+
//* See authentication for more information.

registry/registry-options.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
:context: registry-options
2+
= Registry options
3+
include::modules/common-attributes.adoc[]
4+
toc::[]
5+
6+
{product-title} can build images from your source code, deploy them, and manage
7+
their lifecycle. To enable this, {product-title} provides an internal,
8+
integrated container image registry that can be deployed in your {product-title}
9+
environment to locally manage images.
10+
11+
include::modules/registry-integrated-openshift-registry.adoc[leveloffset=+1]
12+
13+
include::modules/registry-third-party-registries.adoc[leveloffset=+1]
14+
15+
include::modules/registry-quay-overview.adoc[leveloffset=+1]
16+
17+
include::modules/registry-authentication-enabled-registry-overview.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)