Skip to content

Commit fb8be83

Browse files
authored
Merge pull request #11291 from bmcelvee/PR10102-Follow-up
PR10102-Follow-up Minor Edits
2 parents 0671301 + 08364ef commit fb8be83

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

dev_guide/managing_images.adoc

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ ifdef::openshift-enterprise,openshift-origin[]
364364
[[using-is-with-k8s]]
365365
== Using Image Streams with Kubernetes Resources
366366

367-
Image Streams, being {product-title} native resources, work out of the box with
367+
Image streams, being {product-title} native resources, work out of the box with
368368
all the rest of native resources available in {product-title}, such as
369369
xref:../dev_guide/builds/index.adoc#dev-guide-how-builds-work[builds] or
370370
xref:../dev_guide/deployments/basic_deployment_operations.adoc#dev-guide-basic-deployment-operations[deployments].
@@ -551,35 +551,40 @@ By default, all service accounts in a project have rights to pull any image in
551551
the same project, and the *builder* service account has rights to push any image
552552
in the same project.
553553

554-
ifdef::openshift-origin,openshift-enterprise,openshift-dedicated,atomic-registry[]
554+
ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
555+
[[managing-images-listing-repositories]]
555556
=== Listing repositories
556557

557-
Listing of repositories (or rather ImageStream names) is supported via `/v2/_catalog` endpoint as
558-
documented
559-
link:https://github.com/docker/distribution/blob/master/docs/spec/api.md#listing-repositories[upstream].
560-
The only requirement is that the authenticated user must have `list` rights on the `imagestreams`
561-
in the whole cluster.
558+
Listing of repositories, or image stream names, is supported by the
559+
`/v2/_catalog` endpoint.
562560

563-
Here is one example of granting a permission to list ImageStreams to a user:
561+
The only requirement is that the authenticated user must have `list` rights on
562+
the `imagestreams` in the whole cluster.
564563

564+
To grant a permission to list image streams to a user, run:
565565
----
566566
$ oc adm policy add-cluster-role-to-user registry-viewer user
567567
----
568568

569-
.A CLI example of listing repositories
569+
To list repositories:
570570
----
571571
$ oc login -u user
572572
$ curl -v -u unused:$(oc whoami -t) https://<registry_server>:<port>/v2/_catalog?n=100
573573
----
574574

575575
[IMPORTANT]
576576
====
577-
This API call is very expensive for a high number of image streams in the cluster. We strongly
578-
recommend to use
577+
This API call is very expensive for a high number of image streams in the cluster.
578+
It is recommend to use
579+
ifdef::openshift-enterprise,openshift-dedicated[]
580+
pagination
581+
endif::openshift-enterprise,openshift-dedicated[]
582+
ifdef::openshift-origin[]
579583
link:https://github.com/docker/distribution/blob/master/docs/spec/api.md#pagination[pagination]
584+
endif::openshift-origin[]
580585
instead of listing all image streams.
581586
====
582-
endif::openshift-origin,openshift-enterprise,openshift-dedicated,atomic-registry[]
587+
endif::openshift-origin,openshift-enterprise,openshift-dedicated[]
583588

584589
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
585590
[[using-image-pull-secrets]]
@@ -1015,7 +1020,7 @@ done by adding the CA certificate or registry certificate to the host system
10151020
running the registry import controller (typically the master node).
10161021

10171022
You must add the certificate or CA certificate to `/etc/pki/tls/certs` or `/etc/pki/ca-trust`,
1018-
respectively, on the host system. You also need to run the `update-ca-trust` command
1023+
respectively, on the host system. You also need to run the `update-ca-trust` command
10191024
on Red Hat distributions followed by a restart of the master services to pick up
10201025
the certificate changes.
10211026

@@ -1025,7 +1030,7 @@ the certificate changes.
10251030
An image stream can be configured to import tag and image metadata from the
10261031
internal registry, but from a different project. The recommended method for
10271032
this is to use the `oc tag` command as shown in xref:adding-tag[Adding Tags to
1028-
Image Streams]:
1033+
image streams]:
10291034

10301035
----
10311036
$ oc tag <source_project>/<image_stream>:<tag> <new_image_stream>:<new_tag>

0 commit comments

Comments
 (0)