Update kubernetes operations backup section

Author: bfeshti

antora.yml

@@ -1,14 +1,14 @@
 name: operations-manual
 title: Operations Manual
-version: '2025.06'
+version: '2025.07'
 current: true
 start_page: ROOT:index.adoc
 nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.06'
-    neo4j-version-minor: '2025.06'
-    neo4j-version-exact: '2025.06.0'
-    neo4j-buildnumber: '2025.06'
-    neo4j-debian-package-version: '1:2025.06.0@'
+    neo4j-version: '2025.07'
+    neo4j-version-minor: '2025.07'
+    neo4j-version-exact: '2025.07.0'
+    neo4j-buildnumber: '2025.07'
+    neo4j-debian-package-version: '1:2025.07.0@'

modules/ROOT/pages/kubernetes/operations/backup-restore.adoc

@@ -69,12 +69,15 @@ backup:
 * *No PV Required*: Previous backups don't need to be stored locally.
 ====
 
+<<<<<<< HEAD
 === Local storage
 
 Local storage creates local backups in the `/backups` mount.
 This mount must be configured to use a persistent storage for large databases using `tempVolume`.
 The `cloudProvider` must be empty.
 
+=======
+>>>>>>> 4372ebde6aea59dcdbdb43bf22689878a1df9db9
 [[kubernetes-neo4j-backup-cloud]]
 == Prepare to back up a database(s) to a cloud provider (AWS, GCP, and Azure) bucket
 
@@ -491,18 +494,28 @@ backup:
 
 === S3 CA certificate setup
 
+<<<<<<< HEAD
 For S3 endpoints with custom CA certificates:
 
 ==== Using Kubernetes secrets
 
 1. **Create the CA certificate secret:**
+=======
+For S3 endpoints with custom CA certificates, use a Kubernetes secret to manage the CA certificate:
+
+. Create the CA certificate secret:
+>>>>>>> 4372ebde6aea59dcdbdb43bf22689878a1df9db9
 +
 [source, bash]
 ----
 kubectl create secret generic s3-ca-cert --from-file=ca.crt=/path/to/your/ca.crt
 ----
 
+<<<<<<< HEAD
 2. **Configure the backup job:**
+=======
+. Configure the backup job:
+>>>>>>> 4372ebde6aea59dcdbdb43bf22689878a1df9db9
 +
 [source, yaml]
 ----
@@ -513,6 +526,10 @@ backup:
   s3CASecretKey: "ca.crt"
   s3EndpointTLS: true  # Automatically set when s3CASecretName is provided
 ----
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4372ebde6aea59dcdbdb43bf22689878a1df9db9
 
 [[kubernetes-neo4j-backup-on-prem]]
 == Prepare to back up a database(s) to on-premises storage
@@ -1091,6 +1108,7 @@ To restore the `system` database, follow the steps described in xref:kubernetes/
 ====
 
 [[kubernetes-backup-migration]]
+<<<<<<< HEAD
 == Migrate from traditional to cloud-native backups
 
 To migrate from persistent volume-based backups to cloud-native:
@@ -1125,3 +1143,17 @@ backup:
   preferDiffAsParent: true
 # tempVolume configuration removed
 ----
+=======
+== Migration from traditional to cloud-native backups
+
+To migrate from persistent volume-based backups to cloud-native backups, you need to follow these steps:
+
+. Perform a final traditional backup to ensure you have the latest data.
+For more information, see <<kubernetes-neo4j-backup-on-prem, Prepare to back up a database(s) to on-premises storage>> and <<kubernetes-neo4j-backup, Back up your databases>>.
+. Upload existing backups to the cloud storage bucket if needed.
+. Update the _backup-values.yaml_ file to configure the cloud provider, bucket name, and credentials.
+See <<kubernetes-neo4j-backup-cloud, Prepare to back up a database(s) to a cloud provider (AWS, GCP, and Azure) bucket>> for details.
+. Install the _neo4j-admin_ Helm chart with the updated _backup-values.yaml_ file to back up your databases to the cloud provider bucket.
+See <<_back_up_your_databases, Back up your databases>> for details.
+
+>>>>>>> 4372ebde6aea59dcdbdb43bf22689878a1df9db9