Skip to content

Commit 86025c5

Browse files
committed
OSDOCS-16866:CQA-2.0-reg-1
1 parent 7cbeae2 commit 86025c5

17 files changed

+83
-47
lines changed

modules/registry-configuring-registry-storage-swift-trust.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
[id="registry-configuring-registry-storage-swift-trust_{context}"]
88
= Configuring Image Registry Operator redirects
99

10+
[role="_abstract"]
1011
By disabling redirects, you can configure the Image Registry Operator to control whether clients such as {product-title} cluster builds or external systems like developer machines are redirected to pull images directly from {rh-openstack-first} Swift storage. This configuration is optional and depends on whether the clients trust the storage's SSL/TLS certificates.
1112

1213
[NOTE]
1314
====
14-
In situations where clients to not trust the storage certificate, setting the `disableRedirect` option can be set to `true` proxies traffic through the image registry. Consequently, however, the image registry might require more resources, especially network bandwidth, to handle the increased load.
15+
In situations where clients to not trust the storage certificate, setting the `disableRedirect` option can be set to `true` proxies traffic through the image registry. Consequently, however, the image registry might require more resources, especially network bandwidth, to handle the increased load.
1516
16-
Alternatively, if clients trust the storage certificate, the registry can allow redirects. This reduces resource demand on the registry itself.
17+
Alternatively, if clients trust the storage certificate, the registry can allow redirects. This reduces resource demand on the registry itself.
1718
1819
Some users might prefer to configure their clients to trust their self-signed certificate authorities (CAs) instead of disabling redirects. If you are using a self-signed CA, you must decide between trusting the custom CAs or disabling redirects.
1920
====

modules/registry-configuring-storage-aws-user-infra.adoc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
[id="registry-configuring-storage-aws-user-infra_{context}"]
99
= Configuring registry storage for AWS with user-provisioned infrastructure
1010

11-
During installation, your cloud credentials are sufficient to create an Amazon S3 bucket
12-
and the Registry Operator will automatically configure storage.
11+
[role="_abstract"]
12+
During installation, your cloud credentials are sufficient to create an Amazon S3 bucket and the Registry Operator will automatically configure storage.
1313

14-
If the Registry Operator cannot create an S3 bucket and automatically configure
15-
storage, you can create an S3 bucket and configure storage with the following
16-
procedure.
14+
If the Registry Operator cannot create an S3 bucket and automatically configure storage, you can create an S3 bucket and configure storage with the following procedure.
15+
16+
[WARNING]
17+
====
18+
To secure your registry images in AWS, link:https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html[block public access]
19+
to the S3 bucket.
20+
====
1721

1822
.Prerequisites
1923

@@ -24,9 +28,6 @@ procedure.
2428
2529
.Procedure
2630

27-
Use the following procedure if the Registry Operator cannot create an S3 bucket
28-
and automatically configure storage.
29-
3031
. Set up a link:https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config[Bucket Lifecycle Policy]
3132
to abort incomplete multipart uploads that are one day old.
3233

@@ -41,14 +42,13 @@ $ oc edit configs.imageregistry.operator.openshift.io/cluster
4142
.Example configuration
4243
[source,yaml]
4344
----
44-
storage:
45-
s3:
46-
bucket: <bucket-name>
47-
region: <region-name>
45+
apiVersion: imageregistry.operator.openshift.io/v1
46+
kind: Config
47+
metadata:
48+
name: cluster
49+
spec:
50+
storage:
51+
s3:
52+
bucket: <bucket-name>
53+
region: <region-name>
4854
----
49-
50-
[WARNING]
51-
====
52-
To secure your registry images in AWS, link:https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html[block public access]
53-
to the S3 bucket.
54-
====

modules/registry-configuring-storage-azure-gov-cloud.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-configuring-storage-azure-gov-cloud_{context}"]
77
= Configuring registry storage for Azure Government
88

9+
[role="_abstract"]
910
During installation, your cloud credentials are sufficient to create Azure Blob
1011
Storage, and the Registry Operator automatically configures storage.
1112

modules/registry-configuring-storage-azure-user-infra.adoc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-configuring-storage-azure-user-infra_{context}"]
77
= Configuring registry storage for Azure
88

9+
[role="_abstract"]
910
During installation, your cloud credentials are sufficient to create Azure Blob
1011
Storage, and the Registry Operator automatically configures storage.
1112

@@ -31,8 +32,13 @@ $ oc edit configs.imageregistry.operator.openshift.io/cluster
3132
.Example configuration
3233
[source,yaml]
3334
----
34-
storage:
35-
azure:
36-
accountName: <storage-account-name>
37-
container: <container-name>
35+
apiVersion: imageregistry.operator.openshift.io/v1
36+
kind: Config
37+
metadata:
38+
name: cluster
39+
spec:
40+
storage:
41+
azure:
42+
accountName: <storage-account-name>
43+
container: <container-name>
3844
----

modules/registry-configuring-storage-gcp-user-infra.adoc

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-configuring-storage-gcp-user-infra_{context}"]
77
= Configuring the registry storage for {gcp-short} with user-provisioned infrastructure
88

9+
[role="_abstract"]
910
If the Registry Operator cannot create a {gcp-first} bucket, you must set up the storage medium manually and configure the settings in the registry custom resource (CR).
1011

1112
.Prerequisites
@@ -17,6 +18,11 @@ cloud credentials.
1718
contents of a credentials file provided by {gcp-short}:
1819
** `REGISTRY_STORAGE_GCS_KEYFILE`
1920
21+
[WARNING]
22+
====
23+
You can secure your registry images that use a {gcp-full} Storage bucket by setting link:https://cloud.google.com/storage/docs/using-public-access-prevention[public access prevention].
24+
====
25+
2026
.Procedure
2127

2228
. Set up an link:https://cloud.google.com/storage/docs/lifecycle[Object Lifecycle Management policy] to abort incomplete multipart uploads that are one day old.
@@ -31,16 +37,14 @@ $ oc edit configs.imageregistry.operator.openshift.io/cluster
3137
.Example configuration
3238
[source,yaml]
3339
----
34-
# ...
35-
storage:
36-
gcs:
37-
bucket: <bucket-name>
38-
projectID: <project-id>
39-
region: <region-name>
40-
# ...
40+
apiVersion: imageregistry.operator.openshift.io/v1
41+
kind: Config
42+
metadata:
43+
name: cluster
44+
spec:
45+
storage:
46+
gcs:
47+
bucket: <bucket-name>
48+
projectID: <project-id>
49+
region: <region-name>
4150
----
42-
43-
[WARNING]
44-
====
45-
You can secure your registry images that use a {gcp-full} Storage bucket by setting link:https://cloud.google.com/storage/docs/using-public-access-prevention[public access prevention].
46-
====

modules/registry-configuring-storage-openstack-user-infra.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-configuring-storage-openstack-user-infra_{context}"]
77
= Registry storage for {rh-openstack} with user-provisioned infrastructure
88

9+
[role="_abstract"]
910
If the Registry Operator cannot create a Swift bucket, you must set up the storage medium manually and configure the settings in the registry custom resource (CR).
1011

1112
.Prerequisites
@@ -30,9 +31,12 @@ $ oc edit configs.imageregistry.operator.openshift.io/cluster
3031
.Example configuration
3132
[source,yaml]
3233
----
33-
# ...
34-
storage:
35-
swift:
36-
container: <container-id>
37-
# ...
34+
apiVersion: imageregistry.operator.openshift.io/v1
35+
kind: Config
36+
metadata:
37+
name: cluster
38+
spec:
39+
storage:
40+
swift:
41+
container: <container-id>
3842
----

modules/registry-operator-config-resources-secret-aws.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
[id="registry-operator-config-resources-secret-aws_{context}"]
77
= Configuring a secret for the Image Registry Operator
88

9+
10+
[role="_abstract"]
911
In addition to the `configs.imageregistry.operator.openshift.io` and ConfigMap
1012
resources, configuration is provided to the Operator by a separate secret
1113
resource located within the `openshift-image-registry` namespace.

modules/registry-operator-config-resources-secret-azure.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[id="registry-operator-config-resources-secret-azure_{context}"]
88
= Configuring a secret for the Image Registry Operator
99

10+
[role="_abstract"]
1011
In addition to the `configs.imageregistry.operator.openshift.io` and ConfigMap
1112
resources, configuration is provided to the Operator by a separate secret
1213
resource located within the `openshift-image-registry` namespace.

modules/registry-operator-config-resources-secret-gcp.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-operator-config-resources-secret-gcp_{context}"]
77
= Configuring a secret for the Image Registry Operator
88

9+
[role="_abstract"]
910
In addition to the `configs.imageregistry.operator.openshift.io` and ConfigMap
1011
resources, configuration is provided to the Operator by a separate secret
1112
resource located within the `openshift-image-registry` namespace.

modules/registry-operator-config-resources-secret-openstack.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[id="registry-operator-config-resources-secret-openstack_{context}"]
77
= Configuring a secret for the Image Registry Operator
88

9+
[role="_abstract"]
910
In addition to the `configs.imageregistry.operator.openshift.io` and ConfigMap
1011
resources, configuration is provided to the Operator by a separate secret
1112
resource located within the `openshift-image-registry` namespace.

0 commit comments

Comments
 (0)