Skip to content

Commit 4567425

Browse files
authored
Merge pull request #102877 from JoeAldinger/OSDOCS-16867
OSDOCS-16867:CQA-2.0-Reg-2
2 parents 8ae85a9 + 4a727ee commit 4567425

18 files changed

+73
-48
lines changed

modules/configuring-registry-storage-nutanix.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[id="configuring-registry-storage-nutanix_{context}"]
66
= Configuring registry storage for Nutanix
77

8+
[role="_abstract"]
89
As a cluster administrator, following installation you must configure your registry to use storage.
910

1011
.Prerequisites
@@ -59,9 +60,10 @@ $ oc edit configs.imageregistry.operator.openshift.io
5960
----
6061
storage:
6162
pvc:
62-
claim: <1>
63+
claim:
6364
----
64-
<1> Leave the `claim` field blank to allow the automatic creation of an `image-registry-storage` persistent volume claim (PVC). The PVC is generated based on the default storage class. However, be aware that the default storage class might provide ReadWriteOnce (RWO) volumes, such as a RADOS Block Device (RBD), which can cause issues when you replicate to more than one replica.
65+
+
66+
Leave the `claim` field blank to allow the automatic creation of an `image-registry-storage` persistent volume claim (PVC). The PVC is generated based on the default storage class. However, be aware that the default storage class might provide ReadWriteOnce (RWO) volumes, such as a RADOS Block Device (RBD), which can cause issues when you replicate to more than one replica.
6567

6668

6769
. Check the `clusteroperator` status:

modules/installation-registry-osp-creating-custom-pvc.adoc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="installation-registry-osp-creating-custom-pvc_{context}"]
77
= Configuring an image registry with custom storage on clusters that run on {rh-openstack}
88

9+
[role="_abstract"]
910
After you install a cluster on {rh-openstack-first}, you can use a Cinder volume that is in a specific availability zone for registry storage.
1011

1112
.Procedure
@@ -51,7 +52,7 @@ apiVersion: v1
5152
kind: PersistentVolumeClaim
5253
metadata:
5354
name: csi-pvc-imageregistry
54-
namespace: openshift-image-registry <1>
55+
namespace: openshift-image-registry
5556
annotations:
5657
imageregistry.openshift.io: "true"
5758
spec:
@@ -60,12 +61,15 @@ spec:
6061
volumeMode: Filesystem
6162
resources:
6263
requests:
63-
storage: 100Gi <2>
64-
storageClassName: <your_custom_storage_class> <3>
64+
storage: 100Gi
65+
storageClassName: <your_custom_storage_class>
6566
----
66-
<1> Enter the namespace `openshift-image-registry`. This namespace allows the Cluster Image Registry Operator to consume the PVC.
67-
<2> Optional: Adjust the volume size.
68-
<3> Enter the name of the storage class that you created.
67+
+
68+
where:
69+
70+
`openshift-image-registry`:: Specifying this namespace allows the Cluster Image Registry Operator to consume the PVC.
71+
`storage`:: This optional field adjusts the volume size.
72+
`storageClassName`:: Specifies the name of the storage class that you created.
6973

7074
. From a command line, apply the configuration:
7175
+

modules/installation-registry-storage-block-recreate-rollout-bare-metal.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ storage:
7676
claim:
7777
----
7878
+
79-
By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.
79+
By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.

modules/installation-registry-storage-block-recreate-rollout-nutanix.adoc

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
[id="installation-registry-storage-block-recreate-rollout-nutanix_{context}"]
1111
= Configuring block registry storage for Nutanix volumes
1212

13+
[role="_abstract"]
1314
To allow the image registry to use block storage types such as Nutanix volumes during upgrades as a cluster administrator, you can use the `Recreate` rollout strategy.
1415

1516
[IMPORTANT]
@@ -37,19 +38,21 @@ $ oc patch config.imageregistry.operator.openshift.io/cluster --type=merge -p '{
3738
kind: PersistentVolumeClaim
3839
apiVersion: v1
3940
metadata:
40-
name: image-registry-storage <1>
41-
namespace: openshift-image-registry <2>
41+
name: image-registry-storage
42+
namespace: openshift-image-registry
4243
spec:
4344
accessModes:
44-
- ReadWriteOnce <3>
45+
- ReadWriteOnce
4546
resources:
4647
requests:
47-
storage: 100Gi <4>
48+
storage: 100Gi
4849
----
49-
<1> A unique name that represents the `PersistentVolumeClaim` object.
50-
<2> The namespace for the `PersistentVolumeClaim` object, which is `openshift-image-registry`.
51-
<3> The access mode of the persistent volume claim. With `ReadWriteOnce`, the volume can be mounted with read and write permissions by a single node.
52-
<4> The size of the persistent volume claim.
50+
where:
51+
52+
`name`:: Specifies a unique name that represents the `PersistentVolumeClaim` object.
53+
`namespace`:: Specifies the namespace for the `PersistentVolumeClaim` object, which is `openshift-image-registry`.
54+
`ReadWriteOnce`:: Specifies the access mode of the persistent volume claim. With `ReadWriteOnce`, the volume can be mounted with read and write permissions by a single node.
55+
`storage`:: Specifies the size of the persistent volume claim.
5356

5457
.. Enter the following command to create the `PersistentVolumeClaim` object from the file:
5558
+
@@ -72,4 +75,5 @@ storage:
7275
pvc:
7376
claim: <1>
7477
----
75-
<1> By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.
78+
+
79+
By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.

modules/installation-registry-storage-block-recreate-rollout.adoc

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
[id="installation-registry-storage-block-recreate-rollout_{context}"]
1313
= Configuring block registry storage for VMware vSphere
1414

15+
[role="_abstract"]
1516
To allow the image registry to use block storage types such as vSphere Virtual Machine Disk (VMDK) during upgrades as a cluster administrator, you can use the `Recreate` rollout strategy.
1617

1718
[IMPORTANT]
@@ -39,19 +40,22 @@ $ oc patch config.imageregistry.operator.openshift.io/cluster --type=merge -p '{
3940
kind: PersistentVolumeClaim
4041
apiVersion: v1
4142
metadata:
42-
name: image-registry-storage <1>
43-
namespace: openshift-image-registry <2>
43+
name: image-registry-storage
44+
namespace: openshift-image-registry
4445
spec:
4546
accessModes:
46-
- ReadWriteOnce <3>
47+
- ReadWriteOnce
4748
resources:
4849
requests:
49-
storage: 100Gi <4>
50+
storage: 100Gi
5051
----
51-
<1> A unique name that represents the `PersistentVolumeClaim` object.
52-
<2> The namespace for the `PersistentVolumeClaim` object, which is `openshift-image-registry`.
53-
<3> The access mode of the persistent volume claim. With `ReadWriteOnce`, the volume can be mounted with read and write permissions by a single node.
54-
<4> The size of the persistent volume claim.
52+
+
53+
where:
54+
55+
`name`:: Specifies a unique name that represents the `PersistentVolumeClaim` object.
56+
`namespace`:: Specifies the `namespace` for the `PersistentVolumeClaim` object, which is `openshift-image-registry`.
57+
`accessModes`:: Specifies the access mode of the persistent volume claim. With `ReadWriteOnce`, the volume can be mounted with read and write permissions by a single node.
58+
`storage`:: The size of the persistent volume claim.
5559

5660
.. Enter the following command to create the `PersistentVolumeClaim` object from the file:
5761
+
@@ -73,6 +77,7 @@ $ oc edit config.imageregistry.operator.openshift.io -o yaml
7377
----
7478
storage:
7579
pvc:
76-
claim: <1>
80+
claim:
7781
----
78-
<1> By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.
82+
+
83+
By creating a custom PVC, you can leave the `claim` field blank for the default automatic creation of an `image-registry-storage` PVC.

modules/installation-registry-storage-config.adoc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,12 @@ endif::[]
3434
= Image registry storage configuration
3535

3636
ifdef::aws[]
37-
Amazon Web Services provides default storage, which means the Image Registry
38-
Operator is available after installation. However, if the Registry Operator
39-
cannot create an S3 bucket and automatically configure storage, you must
40-
manually configure registry storage.
37+
[role="_abstract"]
38+
Amazon Web Services provides default storage, which means the Image Registry Operator is available after installation. However, if the Registry Operator cannot create an S3 bucket and automatically configure storage, you must manually configure registry storage.
4139
endif::aws[]
4240
ifndef::aws[]
43-
The Image Registry Operator is not initially available for platforms that do
44-
not provide default storage. After installation, you must configure your
45-
registry to use storage so that the Registry Operator is made available.
41+
[role="_abstract"]
42+
The Image Registry Operator is not initially available for platforms that do not provide default storage. After installation, you must configure your registry to use storage so that the Registry Operator is made available.
4643
endif::aws[]
4744
4845
Instructions are shown for configuring a persistent volume, which is required for production clusters. Where applicable, instructions are shown for configuring an empty directory as the storage location, which is available for only non-production clusters.

modules/installation-registry-storage-non-production.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
[id="installation-registry-storage-non-production_{context}"]
1919
= Configuring storage for the image registry in non-production clusters
2020

21-
You must configure storage for the Image Registry Operator. For non-production
22-
clusters, you can set the image registry to an empty directory. If you do so,
23-
all images are lost if you restart the registry.
21+
[role="_abstract"]
22+
You must configure storage for the Image Registry Operator. For non-production clusters, you can set the image registry to an empty directory. If you do so, all images are lost if you restart the registry.
2423

2524
.Procedure
2625

modules/registry-change-management-state.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
[id="registry-change-management-state_{context}"]
1313
= Changing the image registry's management state
1414

15+
[role="_abstract"]
1516
To start the image registry, you must change the Image Registry Operator configuration's `managementState` from `Removed` to `Managed`.
1617

1718
.Procedure

modules/registry-configuring-registry-storage-rhodf-cephfs.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
[id="registry-configuring-registry-storage-rhodf-cephfs_{context}"]
1111
= Configuring the Image Registry Operator to use CephFS storage with Red Hat OpenShift Data Foundation
1212

13+
[role="_abstract"]
1314
{rh-storage-first} integrates multiple storage types that you can use with the {product-registry}:
1415

1516
* Ceph, a shared and distributed file system and on-premise object storage
1617
* NooBaa, providing a Multicloud Object Gateway
1718
18-
This document outlines the procedure to configure the image registry to use CephFS storage.
19+
Use the following procedure to configure the image registry to use CephFS storage.
1920

2021
[NOTE]
2122
====

modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Ceph, a shared and distributed file system and on-premise object storage
1717
* NooBaa, providing a Multicloud Object Gateway
1818
19-
This document outlines the procedure to configure the image registry to use Ceph RGW storage.
19+
Use the following, procedure to configure the image registry to use Ceph RGW storage.
2020

2121

2222
.Prerequisites

0 commit comments

Comments
 (0)