From 9c387bbbbccc9d29e328e089a75c2d3cd0ad902e Mon Sep 17 00:00:00 2001
From: Martin Jackson <martjack@redhat.com>
Date: Tue, 14 Apr 2026 08:14:58 -0500
Subject: [PATCH 1/4] Personalize

---
 overrides/values-cluster-names.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/overrides/values-cluster-names.yaml b/overrides/values-cluster-names.yaml
index 31e1a1f..8eee5c8 100644
--- a/overrides/values-cluster-names.yaml
+++ b/overrides/values-cluster-names.yaml
@@ -6,24 +6,24 @@
 
 clusterOverrides:
   primary:
-    name: ocp-primary
-    version: 4.18.7
+    name: rdrsk-secondary
+    version: 4.20.6
     install_config:
       metadata:
-        name: ocp-primary
+        name: rdrsk-primary
       platform:
         aws:
           region: us-west-1
   secondary:
     name: ocp-secondary
-    version: 4.18.7
+    version: 4.20.6
     install_config:
       metadata:
-        name: ocp-secondary
+        name: rdrsk-secondary
       platform:
         aws:
           region: us-east-1
 
 # DRPC overrides (preferredCluster defaults to primary if unset)
 drpc:
-  preferredCluster: ocp-primary
+  preferredCluster: rdrsk-primary

From 14e91eb8dc0d0d9ab81f719102ac96d778ece380 Mon Sep 17 00:00:00 2001
From: Martin Jackson <martjack@redhat.com>
Date: Tue, 14 Apr 2026 09:40:32 -0500
Subject: [PATCH 2/4] Align clusternames

---
 overrides/values-cluster-names.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overrides/values-cluster-names.yaml b/overrides/values-cluster-names.yaml
index 8eee5c8..9546f0b 100644
--- a/overrides/values-cluster-names.yaml
+++ b/overrides/values-cluster-names.yaml
@@ -6,7 +6,7 @@
 
 clusterOverrides:
   primary:
-    name: rdrsk-secondary
+    name: rdrsk-primary
     version: 4.20.6
     install_config:
       metadata:
@@ -15,7 +15,7 @@ clusterOverrides:
         aws:
           region: us-west-1
   secondary:
-    name: ocp-secondary
+    name: rdrsk-secondary
     version: 4.20.6
     install_config:
       metadata:

From 403f78060617cb56286edd69860d69be8fecf796 Mon Sep 17 00:00:00 2001
From: Martin Jackson <martjack@redhat.com>
Date: Tue, 14 Apr 2026 15:45:21 -0500
Subject: [PATCH 3/4] OADP -> stable because that is the only channel in OCP
 4.20+

---
 values-resilient.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values-resilient.yaml b/values-resilient.yaml
index d6c5e87..bbfc1c0 100644
--- a/values-resilient.yaml
+++ b/values-resilient.yaml
@@ -49,7 +49,7 @@ clusterGroup:
     openshift-oadp:
       name: redhat-oadp-operator
       namespace: openshift-adp
-      channel: stable-1.4
+      channel: stable
 
   projects:
     - resilient

From 1971e20f452f40b1f22525086e3dc9e7e64c36e4 Mon Sep 17 00:00:00 2001
From: Martin Jackson <martjack@redhat.com>
Date: Tue, 14 Apr 2026 16:08:02 -0500
Subject: [PATCH 4/4] Return to defaults to prep for v1.1

---
 Changes.md                          |  6 ++++++
 overrides/values-cluster-names.yaml | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Changes.md b/Changes.md
index 00f6cf9..6d2f9b7 100644
--- a/Changes.md
+++ b/Changes.md
@@ -24,3 +24,9 @@ previously documented AWS secret instead of creating a new one with the same mat
 * When OCP 4.20+ support is ready, there will be a v1.1 branch to use it.
 * Externalize all charts to prep for subsequent demo pattern.
 * Pass values-egv-dr into edge-gitops-vms chart. It used to use a symlink when it was local.
+
+v1.1 - April 2026
+
+* Change submariner to use vxlan mode by default, for compatibility reasons
+* Default to OCP 4.20+. The subscription for OADP requires "stable" channel not "stable-1.4".
+* Numerous small changes to deal with race conditions and other potential issues
diff --git a/overrides/values-cluster-names.yaml b/overrides/values-cluster-names.yaml
index 9546f0b..794407f 100644
--- a/overrides/values-cluster-names.yaml
+++ b/overrides/values-cluster-names.yaml
@@ -6,24 +6,24 @@
 
 clusterOverrides:
   primary:
-    name: rdrsk-primary
+    name: ocp-primary
     version: 4.20.6
     install_config:
       metadata:
-        name: rdrsk-primary
+        name: ocp-primary
       platform:
         aws:
           region: us-west-1
   secondary:
-    name: rdrsk-secondary
+    name: ocp-secondary
     version: 4.20.6
     install_config:
       metadata:
-        name: rdrsk-secondary
+        name: ocp-secondary
       platform:
         aws:
           region: us-east-1
 
 # DRPC overrides (preferredCluster defaults to primary if unset)
 drpc:
-  preferredCluster: rdrsk-primary
+  preferredCluster: ocp-primary