Skip to content

Commit 6aef0d7

Browse files
authored
Merge pull request openshift#46994 from bmcelvee/OSDOCS-3680
OSDOCS-3680: Remove backup language from ROSA documentation
2 parents f525ceb + 620082a commit 6aef0d7

File tree

5 files changed

+39
-41
lines changed

5 files changed

+39
-41
lines changed

modules/policy-incident.adoc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ The following activities can trigger notifications:
4444
== Backup and recovery
4545
All {product-title} clusters are backed up using cloud provider snapshots. Notably, this does not include customer data stored on persistent volumes. All snapshots are taken using the appropriate cloud provider snapshot APIs and are uploaded to a secure object storage bucket (S3 in AWS, and GCS in Google Cloud) in the same account as the cluster.
4646

47+
//Verify if the corresponding tables in rosa-sdpolicy-platform.adoc and rosa-policy-incident.adoc also need to be updated.
48+
4749
[cols= "3a,2a,2a,3a",options="header"]
4850

4951
|===
@@ -52,10 +54,10 @@ All {product-title} clusters are backed up using cloud provider snapshots. Notab
5254
|Retention
5355
|Notes
5456

55-
.2+|Full object store backup, all SRE-managed cluster persistent volumes (PVs)
57+
.2+|Full object store backup, all cluster persistent volumes (PVs)
5658
|Daily
5759
|7 days
58-
.2+|This is a full backup of all Kubernetes objects like etcd, as well as all SRE-managed PVs in the cluster.
60+
.2+|This is a full backup of all Kubernetes objects like etcd, as well as all PVs in the cluster.
5961

6062
|Weekly
6163
|30 days
@@ -73,14 +75,10 @@ All {product-title} clusters are backed up using cloud provider snapshots. Notab
7375

7476
|===
7577

76-
* Red Hat SRE rehearses recovery processes quarterly.
7778
* Red Hat does not commit to any Recovery Point Objective (RPO) or Recovery Time Objective (RTO).
78-
* Customers should take regular backups of their data.
79-
* Backups performed by SRE are taken as a precautionary measure only. They are stored in the same region as the cluster.
80-
* Customers can access SRE backup data on request by opening a support case.
81-
* Red Hat highly encourages customers to deploy multi-AZ clusters with workloads that follow Kubernetes best practices to ensure high availability within a region.
82-
* In the event an entire cloud region is unavailable, customers must install a new cluster in a different region and restore their apps using their backup data.
83-
79+
* Customers are responsible for taking regular backups of their data
80+
* Customers should deploy multi-AZ clusters with workloads that follow Kubernetes best practices to ensure high availability within a region.
81+
* If an entire cloud region is unavailable, customers must install a new cluster in a different region and restore their apps using their backup data.
8482

8583
[id="cluster-capacity_{context}"]
8684
== Cluster capacity

modules/rosa-aws-provisioned.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Up to two Network Elastic Load Balancers (ELBs) for API and up to two Classic EL
5050

5151
[id="rosa-s3-storage_{context}"]
5252
== S3 storage
53-
The image registry and Elastic Block Store (EBS) volume snapshots are backed by AWS S3 storage. Pruning of resources is performed regularly to optimize S3 usage and cluster performance.
53+
The image registry is backed by AWS S3 storage. Pruning of resources is performed regularly to optimize S3 usage and cluster performance.
5454

5555
[NOTE]
5656
====

modules/rosa-policy-incident.adoc

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ The following activities can trigger notifications:
4545

4646
There is no backup method available for ROSA clusters with STS.
4747

48-
[id="rosa-policy-backup-recovery-non-sts_{context}"]
49-
== Backup and recovery for ROSA clusters without STS
48+
[id="backup-recovery_{context}"]
49+
== Backup and recovery
50+
All Red Hat OpenShift Service on AWS cluster metadata from OpenShift Cluster Manager is securely backed up by Red Hat. The following table outlines backup and recovery strategies:
5051

51-
All {product-title} clusters are backed up using AWS snapshots. Notably, this does not include customer data stored on persistent volumes (PVs). All snapshots are taken using the appropriate AWS snapshot APIs and are uploaded to a secure AWS S3 object storage bucket in the same account as the cluster.
52+
//Verify if the corresponding tables in rosa-sdpolicy-platform.adoc and policy-incident.adoc also need to be updated.
5253

5354
[cols= "3a,2a,2a,3a",options="header"]
5455

@@ -58,34 +59,31 @@ All {product-title} clusters are backed up using AWS snapshots. Notably, this do
5859
|Retention
5960
|Notes
6061

61-
.2+|Full object store backup, all SRE-managed cluster PVs
62+
.2+|Full object store backup, all cluster persistent volumes (PVs)
6263
|Daily
6364
|7 days
64-
.2+|This is a full backup of all Kubernetes objects, such as etcd, and all SRE-managed PVs in the cluster.
65+
.2+|This is a full backup of all Kubernetes objects like etcd, as well as all PVs in the cluster.
6566

6667
|Weekly
6768
|30 days
6869

6970

7071
|Full object store backup
7172
|Hourly
72-
|24-hour
73-
|This is a full backup of all Kubernetes objects, such as etcd. No PVs are backed up in this backup schedule.
73+
|24 hour
74+
|This is a full backup of all Kubernetes objects like etcd. No PVs are backed up in this backup schedule.
7475

7576
|Node root volume
7677
|Never
7778
|N/A
78-
|Nodes are considered to be short-term. Do not store anything critical on a node's root volume.
79+
|Nodes are considered to be short-term. Nothing critical should be stored on a node's root volume.
7980

8081
|===
8182

82-
- Red Hat rehearses recovery processes periodically.
83-
- Red Hat does not commit to any Recovery Point Objective (RPO) or Recovery Time Objective (RTO).
84-
- Customers are responsible for taking regular backups of their data.
85-
- Backups performed by the SRE are taken as a precautionary measure only. They are stored in the same region as the cluster.
86-
- Customers can access the SRE backup data on request through a support case.
87-
- Red Hat encourages customers to deploy multiple availability zone (multi-AZ) clusters with workloads that follow Kubernetes best practices to ensure high availability within a region.
88-
- In the event an entire AWS region is unavailable, customers must install a new cluster in a different region and restore their apps using their backup data.
83+
* Red Hat does not commit to any Recovery Point Objective (RPO) or Recovery Time Objective (RTO).
84+
* Customers are responsible for taking regular backups of their data
85+
* Customers should deploy multi-AZ clusters with workloads that follow Kubernetes best practices to ensure high availability within a region.
86+
* If an entire cloud region is unavailable, customers must install a new cluster in a different region and restore their apps using their backup data.
8987

9088
[id="rosa-policy-cluster-capacity_{context}"]
9189
== Cluster capacity

modules/rosa-sdpolicy-platform.adoc

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,36 @@ It is critical that customers have a backup plan for their applications and appl
1919
====
2020

2121
Application and application data backups are not a part of the {product-title} service.
22-
All Kubernetes objects and persistent volumes (PVs) in each {product-title} cluster are backed up to facilitate a prompt recovery in the unlikely event that a cluster becomes irreparably inoperable.
22+
The following table outlines the cluster backup policy.
2323

24-
The backups are stored in a secure object storage, or multiple availability zone, bucket in the same account as the cluster.
25-
Node root volumes are not backed up, as Red Hat CoreOS is fully managed by the {product-title} cluster and no stateful data should be stored on a node's root volume.
24+
//Verify if the corresponding tables in policy-incident.adoc and rosa-policy-incident.adoc also need to be updated.
2625

27-
The following table shows the frequency of backups:
28-
[cols="4",options="header"]
29-
|===
26+
[cols= "3a,2a,2a,3a",options="header"]
3027

28+
|===
3129
|Component
3230
|Snapshot frequency
3331
|Retention
3432
|Notes
3533

36-
|Full object store backup, all cluster PVs
37-
|Daily at 0100 UTC
34+
.2+|Full object store backup, all cluster persistent volumes (PVs)
35+
|Daily
3836
|7 days
39-
|This is a full backup of all Kubernetes objects, as well as all mounted PVs in the cluster.
37+
.2+|This is a full backup of all Kubernetes objects like etcd, as well as all PVs in the cluster.
4038

41-
|Full object store backup, all cluster PVs
42-
|Weekly on Mondays at 0200 UTC
39+
|Weekly
4340
|30 days
44-
|This is a full backup of all Kubernetes objects, as well as all mounted PVs in the cluster.
41+
4542

4643
|Full object store backup
47-
|Hourly at 17 minutes past the hour
48-
|24 hours
49-
|This is a full backup of all Kubernetes objects. No PVs are backed up in this backup schedule.
44+
|Hourly
45+
|24 hour
46+
|This is a full backup of all Kubernetes objects like etcd. No PVs are backed up in this backup schedule.
47+
48+
|Node root volume
49+
|Never
50+
|N/A
51+
|Nodes are considered to be short-term. Nothing critical should be stored on a node's root volume.
5052

5153
|===
5254

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Module included in the following assemblies:
22
//
33
// * rosa_getting_started_sts/rosa-sts-aws-prereqs.adoc
4+
45
:_content-type: CONCEPT
56
[id="rosa-security-requirements_{context}"]
67
= Security requirements
7-
* Volume snapshots will remain within the customer's AWS account and customer-specified region.
88
* Red Hat must have ingress access to EC2 hosts and the API server from allow-listed IP addresses.
99
* Red Hat must have egress allowed to the documented domains. See the "AWS firewall prerequisites" section for the designated domains.

0 commit comments

Comments
 (0)