Skip to content

Commit 45c8edd

Browse files
authored
Merge pull request #63779 from stevsmit/OCPBUGS-12892
Updates procedure for manually configuring storage for GCP and Swift
2 parents c9f3fbc + 02a8d95 commit 45c8edd

File tree

2 files changed

+47
-9
lines changed

2 files changed

+47
-9
lines changed

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
:_content-type: PROCEDURE
66
[id="registry-configuring-storage-gcp-user-infra_{context}"]
7-
= Registry storage for GCP with user-provisioned infrastructure
7+
= Configuring the registry storage for GCP with user-provisioned infrastructure
88

9-
You must set up the storage medium manually and configure the settings in the
10-
registry custom resource (CR).
9+
If the Registry Operator cannot create a Google Cloud Platform (GCP) bucket, you must set up the storage medium manually and configure the settings in the registry custom resource (CR).
1110

1211
.Prerequisites
1312

@@ -18,9 +17,30 @@ cloud credentials.
1817
contents of a credentials file provided by GCP:
1918
** `REGISTRY_STORAGE_GCS_KEYFILE`
2019
21-
2220
.Procedure
2321

24-
////
25-
Stub for procedure to manually set storage medium.
26-
////
22+
. 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.
23+
24+
. Fill in the storage configuration in `configs.imageregistry.operator.openshift.io/cluster`:
25+
+
26+
[source,terminal]
27+
----
28+
$ oc edit configs.imageregistry.operator.openshift.io/cluster
29+
----
30+
+
31+
.Example configuration
32+
[source,yaml]
33+
----
34+
# ...
35+
storage:
36+
gcs:
37+
bucket: <bucket-name>
38+
projectID: <project-id>
39+
region: <region-name>
40+
# ...
41+
----
42+
43+
[WARNING]
44+
====
45+
You can secure your registry images that use a Google Cloud 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: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
[id="registry-configuring-storage-openstack-user-infra_{context}"]
66
= Registry storage for {rh-openstack} with user-provisioned infrastructure
77

8-
You must set up the storage medium manually and configure the settings in the
9-
registry custom resource (CR).
8+
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).
109

1110
.Prerequisites
1211

@@ -17,3 +16,22 @@ cloud credentials.
1716

1817
** `REGISTRY_STORAGE_SWIFT_USER`
1918
** `REGISTRY_STORAGE_SWIFT_PASSWORD`
19+
20+
.Procedure
21+
22+
* Fill in the storage configuration in `configs.imageregistry.operator.openshift.io/cluster`:
23+
+
24+
[source,terminal]
25+
----
26+
$ oc edit configs.imageregistry.operator.openshift.io/cluster
27+
----
28+
+
29+
.Example configuration
30+
[source,yaml]
31+
----
32+
# ...
33+
storage:
34+
swift:
35+
container: <container-id>
36+
# ...
37+
----

0 commit comments

Comments
 (0)