Skip to content

Commit 470e688

Browse files
authored
Merge pull request #79342 from RichardHoch/not_just_minio
Replace 'minio' with a generic term in sample YAML files
2 parents b96bbc0 + c7e773d commit 470e688

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

modules/oadp-installing-dpa-1-2-and-earlier.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,27 +245,28 @@ spec:
245245
- velero:
246246
config:
247247
profile: "default"
248-
region: minio
249-
s3Url: <url> # <5>
248+
region: <region_name> <5>
249+
s3Url: <url> # <6>
250250
insecureSkipTLSVerify: "true"
251251
s3ForcePathStyle: "true"
252252
provider: {provider}
253253
default: true
254254
credential:
255255
key: cloud
256-
name: {credentials} # <6>
256+
name: {credentials} # <7>
257257
objectStorage:
258-
bucket: <bucket_name> # <7>
259-
prefix: <prefix> # <8>
258+
bucket: <bucket_name> # <8>
259+
prefix: <prefix> # <9>
260260
----
261261
<1> The `openshift` plugin is mandatory.
262262
<2> Specify how many minutes to wait for several Velero resources before timeout occurs, such as Velero CRD availability, volumeSnapshot deletion, and backup repository availability. The default is 10m.
263263
<3> Set this value to `false` if you want to disable the Restic installation. Restic deploys a daemon set, which means that Restic pods run on each working node. In OADP version 1.2 and later, you can configure Restic for backups by adding `spec.defaultVolumesToFsBackup: true` to the `Backup` CR. In OADP version 1.1, add `spec.defaultVolumesToRestic: true` to the `Backup` CR.
264264
<4> Specify on which nodes Restic is available. By default, Restic runs on all nodes.
265-
<5> Specify the URL of the S3 endpoint.
266-
<6> If you do not specify this value, the default name, `{credentials}`, is used. If you specify a custom name, the custom name is used for the backup location.
267-
<7> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
268-
<8> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
265+
<5> Specify the region, following the naming convention of the documentation of your object storage server.
266+
<6> Specify the URL of the S3 endpoint.
267+
<7> If you do not specify this value, the default name, `{credentials}`, is used. If you specify a custom name, the custom name is used for the backup location.
268+
<8> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
269+
<9> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
269270
endif::[]
270271
ifdef::installing-oadp-ocs[]
271272
+

modules/oadp-installing-dpa-1-3.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,18 +258,18 @@ spec:
258258
- velero:
259259
config:
260260
profile: "default"
261-
region: minio
262-
s3Url: <url> # <8>
261+
region: <region_name> <8>
262+
s3Url: <url> # <9>
263263
insecureSkipTLSVerify: "true"
264264
s3ForcePathStyle: "true"
265265
provider: {provider}
266266
default: true
267267
credential:
268268
key: cloud
269-
name: {credentials} # <9>
269+
name: {credentials} # <10>
270270
objectStorage:
271-
bucket: <bucket_name> # <10>
272-
prefix: <prefix> # <11>
271+
bucket: <bucket_name> # <11>
272+
prefix: <prefix> # <12>
273273
----
274274
<1> The default namespace for OADP is `openshift-adp`. The namespace is a variable and is configurable.
275275
<2> The `openshift` plugin is mandatory.
@@ -278,10 +278,11 @@ spec:
278278
<5> Set this value to `true` if you want to enable `nodeAgent` and perform File System Backup.
279279
<6> Enter `kopia` or `restic` as your uploader. You cannot change the selection after the installation. For the Built-in DataMover you must use Kopia. The `nodeAgent` deploys a daemon set, which means that the `nodeAgent` pods run on each working node. You can configure File System Backup by adding `spec.defaultVolumesToFsBackup: true` to the `Backup` CR.
280280
<7> Specify the nodes on which Kopia or Restic are available. By default, Kopia or Restic run on all nodes.
281-
<8> Specify the URL of the S3 endpoint.
282-
<9> If you do not specify this value, the default name, `{credentials}`, is used. If you specify a custom name, the custom name is used for the backup location.
283-
<10> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
284-
<11> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
281+
<8> Specify the region, following the naming convention of the documentation of your object storage server.
282+
<9> Specify the URL of the S3 endpoint.
283+
<10> If you do not specify this value, the default name, `{credentials}`, is used. If you specify a custom name, the custom name is used for the backup location.
284+
<11> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
285+
<12> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
285286
endif::[]
286287

287288
ifdef::installing-oadp-ocs[]

modules/oadp-secrets-for-different-credentials.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,21 @@ spec:
180180
- velero:
181181
config:
182182
profile: "default"
183-
region: minio
183+
region: <region_name> <1>
184184
s3Url: <url>
185185
insecureSkipTLSVerify: "true"
186186
s3ForcePathStyle: "true"
187187
provider: {provider}
188188
default: true
189189
credential:
190190
key: cloud
191-
name: <custom_secret> <1>
191+
name: <custom_secret> <2>
192192
objectStorage:
193193
bucket: <bucket_name>
194194
prefix: <prefix>
195195
----
196-
<1> Backup location `Secret` with custom name.
196+
<1> Specify the region, following the naming convention of the documentation of your object storage server.
197+
<2> Backup location `Secret` with custom name.
197198
endif::[]
198199
ifdef::installing-oadp-ocs[]
199200
+

0 commit comments

Comments
 (0)