Skip to content

Commit 92cbf2b

Browse files
authored
Merge pull request #103657 from openshift-cherrypick-robot/cherry-pick-103395-to-enterprise-4.19
[enterprise-4.19] update with CQA DITA compliance
2 parents 09cd78e + 61d178a commit 92cbf2b

18 files changed

+65
-45
lines changed

modules/images-allow-pods-to-reference-images-from-secure-registries.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
[id="images-allow-pods-to-reference-images-from-secure-registries_{context}"]
77
= Allowing pods to reference images from other secured registries
88

9-
To pull a secured container from other private or secured registries, you must create a pull secret from your container client credentials, such as Docker or Podman, and add it to your service account.
9+
[role="_abstract"]
10+
To ensure reliable application deployment on {product-title}, configure image pull secrets. This allows your resources, such as pods and deployments, to authenticate and pull container images successfully from private registries.
11+
12+
To pull a secured container from other private or secured registries, you must create a pull secret from your container client credentials, such as Docker or Podman, and add it to your service account.
1013

1114
Both Docker and Podman use a configuration file to store authentication details to log in to secured or insecure registry:
1215

@@ -55,4 +58,4 @@ metadata:
5558
resourceVersion: "37676"
5659
uid: e2851531-01bc-48ba-878c-de96cfe31020
5760
type: Opaque
58-
----
61+
----

modules/images-getting-info-about-imagestreams.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-getting-info-about-imagestreams_{context}"]
66
= Getting information about image streams
77

8-
You can get general information about the image stream and detailed information about all the tags it is pointing to.
8+
[role="_abstract"]
9+
To efficiently manage and monitor your image streams in {product-title}, retrieve information about their versions. You can get general information about the image stream and detailed information about all the tags it is pointing to, ensuring your deployed applications rely on the correct image versions.
910

1011
.Procedure
1112

@@ -106,4 +107,4 @@ linux/mips64le
106107
linux/ppc64le
107108
linux/riscv64
108109
linux/s390x
109-
----
110+
----

modules/images-imagestream-adding-tags.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-adding-tags_{context}"]
66
= Adding tags to an image stream
77

8-
You can add additional tags to image streams.
8+
[role="_abstract"]
9+
To accurately manage and track specific versions of your container images, add tags to your image streams within {product-title}, This ensures reliable referencing and deployment throughout your environment.
910

1011
.Procedure
1112

modules/images-imagestream-configure.adoc

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
[id="images-imagestream-configure_{context}"]
66
= Configuring image streams
77

8+
[role="_abstract"]
9+
To customize image retrieval and security policies for your applications, configure image streams within {product-title}. This process lets you define image pull specifications, manage tags, and control access permissions necessary for reliable application deployment.
10+
811
An `ImageStream` object file contains the following elements.
912

1013
[id="image-stream-object-definition_{context}"]
@@ -20,26 +23,27 @@ metadata:
2023
labels:
2124
app: ruby-sample-build
2225
template: application-template-stibuild
23-
name: origin-ruby-sample <1>
26+
name: origin-ruby-sample
2427
namespace: test
2528
spec: {}
2629
status:
27-
dockerImageRepository: 172.30.56.218:5000/test/origin-ruby-sample <2>
30+
dockerImageRepository: 172.30.56.218:5000/test/origin-ruby-sample
2831
tags:
2932
- items:
3033
- created: 2017-09-02T10:15:09Z
31-
dockerImageReference: 172.30.56.218:5000/test/origin-ruby-sample@sha256:47463d94eb5c049b2d23b03a9530bf944f8f967a0fe79147dd6b9135bf7dd13d <3>
34+
dockerImageReference: 172.30.56.218:5000/test/origin-ruby-sample@sha256:47463d94eb5c049b2d23b03a9530bf944f8f967a0fe79147dd6b9135bf7dd13d
3235
generation: 2
33-
image: sha256:909de62d1f609a717ec433cc25ca5cf00941545c83a01fb31527771e1fab3fc5 <4>
36+
image: sha256:909de62d1f609a717ec433cc25ca5cf00941545c83a01fb31527771e1fab3fc5
3437
- created: 2017-09-01T13:40:11Z
3538
dockerImageReference: 172.30.56.218:5000/test/origin-ruby-sample@sha256:909de62d1f609a717ec433cc25ca5cf00941545c83a01fb31527771e1fab3fc5
3639
generation: 1
3740
image: sha256:47463d94eb5c049b2d23b03a9530bf944f8f967a0fe79147dd6b9135bf7dd13d
38-
tag: latest <5>
41+
tag: latest
3942
----
43+
where
4044

41-
<1> The name of the image stream.
42-
<2> Docker repository path where new images can be pushed to add or update them in this image stream.
43-
<3> The SHA identifier that this image stream tag currently references. Resources that reference this image stream tag use this identifier.
44-
<4> The SHA identifier that this image stream tag previously referenced. Can be used to rollback to an older image.
45-
<5> The image stream tag name.
45+
`name`:: Specifies the name of the image stream
46+
`ruby-sample`:: Specifies the Docker repository path where new images can be pushed to add or update them in this image stream.
47+
`dockerImageReference`:: Specifies the SHA identifier that this image stream tag currently references. Resources that reference this image stream tag use this identifier
48+
`image`:: Specifies the SHA identifier that this image stream tag previously referenced. You can use it to rollback to an older image.
49+
`tag`:: Specifies the image stream tag name.

modules/images-imagestream-external-image-tags.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-external-image-tags_{context}"]
66
= Adding tags for an external image
77

8-
You can add tags for external images.
8+
[role="_abstract"]
9+
To enable {product-title} resources to track and consume container images sourced from external registries, add tags to the corresponding image streams. This action integrates external image content securely into your cluster's local image management system.
910

1011
.Procedure
1112

modules/images-imagestream-import-images-private-registry.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-import-images-private-registry_{context}"]
66
= Importing images and image streams from private registries
77

8-
An image stream can be configured to import tag and image metadata from private image registries requiring authentication. This procedure applies if you change the registry that the Cluster Samples Operator uses to pull content from to something other than link:https://registry.redhat.io[registry.redhat.io].
8+
[role="_abstract"]
9+
To securely manage content from external sources, configure your image streams to import tag and image metadata from private registries requiring authentication. This procedure is essential if you change the registry that the Cluster Samples Operator uses for pulling content to something other than the default link:https://registry.redhat.io[registry.redhat.io].
910

1011
[NOTE]
1112
====

modules/images-imagestream-import-import-mode.adoc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
[id="images-imagestream-import-import-mode_{context}"]
66
= Working with manifest lists
77

8-
You can import a single sub-manifest, or all manifests, of a manifest list when using `oc import-image` or `oc tag` CLI commands by adding the `--import-mode` flag.
8+
[role="_abstract"]
9+
To precisely manage multi-architecture or variant images contained within a manifest list, use the `--import-mode` flag with `oc import-image` or `oc tag` CLI commands. This functionality allows you to import a single sub-manifest, or all manifests, of a manifest list, providing fine-grained control over your image stream content.
910

10-
Refer to the commands below to create an image stream that includes a single sub-manifest or multi-architecture images.
11+
In some cases, users might want to use sub-manifests directly. When `oc adm prune images` is run, or the `CronJob` pruner runs, they cannot detect when a sub-manifest list is used. As a result, an administrator using `oc adm prune images`, or the `CronJob` pruner, might delete entire manifest lists, including sub-manifests.
12+
13+
To avoid this limitation, you can use the manifest list by tag or by digest instead.
1114

1215
.Procedure
1316

@@ -43,13 +46,3 @@ $ oc import-image <multiarch-image-stream-tag> --from=<registry>/<project_name>
4346
====
4447
The `--import-mode=` default value is `Legacy`. Excluding this value, or failing to specify either `Legacy` or `PreserveOriginal`, imports a single sub-manifest. An invalid import mode returns the following error: `error: valid ImportMode values are Legacy or PreserveOriginal`.
4548
====
46-
47-
48-
[id="images-imagestream-import-import-mode-limitations"]
49-
== Limitations
50-
51-
Working with manifest lists has the following limitations:
52-
53-
* In some cases, users might want to use sub-manifests directly. When `oc adm prune images` is run, or the `CronJob` pruner runs, they cannot detect when a sub-manifest list is used. As a result, an administrator using `oc adm prune images`, or the `CronJob` pruner, might delete entire manifest lists, including sub-manifests.
54-
+
55-
To avoid this limitation, you can use the manifest list by tag or by digest instead.

modules/images-imagestream-import.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-import_{context}"]
66
= Configuring periodic importing of image stream tags
77

8-
When working with an external container image registry, to periodically re-import an image, for example to get latest security updates, you can use the `--scheduled` flag.
8+
[role="_abstract"]
9+
To maintain up-to-date image definitions from an external container image registry, configure periodic importing of image stream tags. This process allows you to quickly re-import images for critical security updates by using the `--scheduled` flag.
910

1011
.Procedure
1112

@@ -36,4 +37,4 @@ This command causes {product-title} to periodically update this particular image
3637
[source,terminal]
3738
----
3839
$ oc tag <repositiory/image> <image-name:tag>
39-
----
40+
----

modules/images-imagestream-mapping.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-mapping_{context}"]
66
= Image stream mapping
77

8-
When the integrated registry receives a new image, it creates and sends an image stream mapping to {product-title}, providing the image's project, name, tag, and image metadata.
8+
[role="_abstract"]
9+
Manage how {product-title} tracks newly uploaded images by understanding image stream mapping. When the integrated registry receives a new image, it automatically creates and sends an image stream mapping, providing the image's crucial project, name, tag, and metadata.
910

1011
[NOTE]
1112
====

modules/images-imagestream-periodic-import-list.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[id="images-imagestream-periodic-import-list_{context}"]
66
= Configuring periodic importing of manifest lists
77

8-
To periodically re-import a manifest list, you can use the `--scheduled` flag.
8+
[role="_abstract"]
9+
To maintain up-to-date image references for complex, multi-architecture images, configure periodic importing of manifest lists. To periodically re-import a manifest list, you can use the `--scheduled` flag, ensuring your image stream tracks the latest versions from external registries.
910

1011
.Procedure
1112

@@ -15,4 +16,4 @@ To periodically re-import a manifest list, you can use the `--scheduled` flag.
1516
----
1617
$ oc import-image <multiarch-image-stream-tag> --from=<registry>/<project_name>/<image-name> \
1718
--import-mode='PreserveOriginal' --scheduled=true
18-
----
19+
----

0 commit comments

Comments
 (0)