From 00aae8c1ef4f8771003450eea8544537d9887769 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 30 Apr 2024 12:09:09 +0200
Subject: [PATCH 1/5] Switch to gitops-1.12

---
 acm/templates/policies/ocp-gitops-policy.yaml                | 2 +-
 acm/values.yaml                                              | 2 +-
 operator-install/templates/pattern.yaml                      | 2 +-
 operator-install/values.yaml                                 | 2 +-
 reference-output.yaml                                        | 2 +-
 tests/acm-industrial-edge-factory.expected.yaml              | 2 +-
 tests/acm-industrial-edge-hub.expected.yaml                  | 2 +-
 tests/acm-medical-diagnosis-hub.expected.yaml                | 2 +-
 tests/acm-naked.expected.yaml                                | 2 +-
 tests/acm-normal.expected.yaml                               | 2 +-
 tests/operator-install-industrial-edge-factory.expected.yaml | 4 ++--
 tests/operator-install-industrial-edge-hub.expected.yaml     | 4 ++--
 tests/operator-install-medical-diagnosis-hub.expected.yaml   | 4 ++--
 tests/operator-install-naked.expected.yaml                   | 4 ++--
 tests/operator-install-normal.expected.yaml                  | 4 ++--
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/acm/templates/policies/ocp-gitops-policy.yaml b/acm/templates/policies/ocp-gitops-policy.yaml
index f46b30c66..bec5b343e 100644
--- a/acm/templates/policies/ocp-gitops-policy.yaml
+++ b/acm/templates/policies/ocp-gitops-policy.yaml
@@ -45,7 +45,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: {{ default "gitops-1.11" .Values.main.gitops.channel }}
+                  channel: {{ default "gitops-1.12" .Values.main.gitops.channel }}
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/acm/values.yaml b/acm/values.yaml
index fb7cb03a0..e9e5035b8 100644
--- a/acm/values.yaml
+++ b/acm/values.yaml
@@ -1,6 +1,6 @@
 main:
   gitops:
-    channel: "gitops-1.11"
+    channel: "gitops-1.12"
 
 global:
   extraValueFiles: []
diff --git a/operator-install/templates/pattern.yaml b/operator-install/templates/pattern.yaml
index 8bf7761a2..ca3234f82 100644
--- a/operator-install/templates/pattern.yaml
+++ b/operator-install/templates/pattern.yaml
@@ -13,7 +13,7 @@ spec:
     tokenSecretNamespace: {{ .Values.main.tokenSecretNamespace }}
 {{- end }} {{/* if and .Values.main.tokenSecret .Values.main.tokenSecretNamespace */}}
   gitOpsSpec:
-    operatorChannel: {{ default "gitops-1.11" .Values.main.gitops.channel }}
+    operatorChannel: {{ default "gitops-1.12" .Values.main.gitops.channel }}
     operatorSource: {{ default "redhat-operators" .Values.main.gitops.operatorSource }}
   multiSourceConfig:
     enabled: {{ .Values.main.multiSourceConfig.enabled }}
diff --git a/operator-install/values.yaml b/operator-install/values.yaml
index 28bc3d4b4..8ce7fe673 100644
--- a/operator-install/values.yaml
+++ b/operator-install/values.yaml
@@ -7,7 +7,7 @@ main:
     revision: main
 
   gitops:
-    channel: "gitops-1.11"
+    channel: "gitops-1.12"
     operatorSource: redhat-operators
 
   multiSourceConfig:
diff --git a/reference-output.yaml b/reference-output.yaml
index cdc1a3034..54f4052ac 100644
--- a/reference-output.yaml
+++ b/reference-output.yaml
@@ -112,7 +112,7 @@ metadata:
   labels:
     operators.coreos.com/openshift-gitops-operator.openshift-operators: ""
 spec:
-  channel: gitops-1.11
+  channel: gitops-1.12
   installPlanApproval: Automatic
   name: openshift-gitops-operator
   source: redhat-operators
diff --git a/tests/acm-industrial-edge-factory.expected.yaml b/tests/acm-industrial-edge-factory.expected.yaml
index 0291231a6..9dfa7d79d 100644
--- a/tests/acm-industrial-edge-factory.expected.yaml
+++ b/tests/acm-industrial-edge-factory.expected.yaml
@@ -109,7 +109,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/acm-industrial-edge-hub.expected.yaml b/tests/acm-industrial-edge-hub.expected.yaml
index 21a1c30d3..453e8a9e5 100644
--- a/tests/acm-industrial-edge-hub.expected.yaml
+++ b/tests/acm-industrial-edge-hub.expected.yaml
@@ -316,7 +316,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/acm-medical-diagnosis-hub.expected.yaml b/tests/acm-medical-diagnosis-hub.expected.yaml
index 40df35e2b..8b50de7a7 100644
--- a/tests/acm-medical-diagnosis-hub.expected.yaml
+++ b/tests/acm-medical-diagnosis-hub.expected.yaml
@@ -307,7 +307,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/acm-naked.expected.yaml b/tests/acm-naked.expected.yaml
index 4f0ac7517..561fbd7ba 100644
--- a/tests/acm-naked.expected.yaml
+++ b/tests/acm-naked.expected.yaml
@@ -110,7 +110,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/acm-normal.expected.yaml b/tests/acm-normal.expected.yaml
index 20a38d52c..66f1c5900 100644
--- a/tests/acm-normal.expected.yaml
+++ b/tests/acm-normal.expected.yaml
@@ -806,7 +806,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/operator-install-industrial-edge-factory.expected.yaml b/tests/operator-install-industrial-edge-factory.expected.yaml
index 0ef51dc04..018eb4c5d 100644
--- a/tests/operator-install-industrial-edge-factory.expected.yaml
+++ b/tests/operator-install-industrial-edge-factory.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
diff --git a/tests/operator-install-industrial-edge-hub.expected.yaml b/tests/operator-install-industrial-edge-hub.expected.yaml
index 0ef51dc04..018eb4c5d 100644
--- a/tests/operator-install-industrial-edge-hub.expected.yaml
+++ b/tests/operator-install-industrial-edge-hub.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
diff --git a/tests/operator-install-medical-diagnosis-hub.expected.yaml b/tests/operator-install-medical-diagnosis-hub.expected.yaml
index 0ef51dc04..018eb4c5d 100644
--- a/tests/operator-install-medical-diagnosis-hub.expected.yaml
+++ b/tests/operator-install-medical-diagnosis-hub.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
diff --git a/tests/operator-install-naked.expected.yaml b/tests/operator-install-naked.expected.yaml
index 024ea7ea5..fc0d76995 100644
--- a/tests/operator-install-naked.expected.yaml
+++ b/tests/operator-install-naked.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
diff --git a/tests/operator-install-normal.expected.yaml b/tests/operator-install-normal.expected.yaml
index 0ef51dc04..018eb4c5d 100644
--- a/tests/operator-install-normal.expected.yaml
+++ b/tests/operator-install-normal.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false

From 75c51cc6bc0cba6c9ae721b1aea5ff139d4e233a Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 24 Apr 2024 15:57:09 +0200
Subject: [PATCH 2/5] Add overrides for MCE IIB

We need to be able to explicitely override the Source and the Channel
used to install the MCE multicluster-engine operator. The reason for
this is that when we install ACM from an IIB, the default channel that
will be used for MCE won't be present in the IIB, so we need to be able
to be flexible in determining where the MCE gets installed from
(sourcecatalog and channel)

We default to redhat-operators because otherwise when installing gitops
via IIB the ACM operator finds a channel for MCE that does not exist, so
we force the source all the time.
---
 acm/templates/multiclusterhub.yaml              | 8 +++++---
 acm/values.yaml                                 | 9 +++++++++
 tests/acm-industrial-edge-factory.expected.yaml | 1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/acm/templates/multiclusterhub.yaml b/acm/templates/multiclusterhub.yaml
index 79ef9339a..a4e8b89b2 100644
--- a/acm/templates/multiclusterhub.yaml
+++ b/acm/templates/multiclusterhub.yaml
@@ -1,3 +1,7 @@
+{{- $channel := "" }}
+{{- if .Values.acm.mce_operator.channel }}
+{{- $channel = printf ",\"channel\": \"%s\"" .Values.acm.mce_operator.channel }}
+{{- end }}
 apiVersion: operator.open-cluster-management.io/v1
 kind: MultiClusterHub
 metadata:
@@ -5,7 +9,5 @@ metadata:
   namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-wave: "-1"
-    {{- if kindIs "map" .Values.clusterGroup.subscriptions }}
-    installer.open-cluster-management.io/mce-subscription-spec: '{"source": "{{ default "redhat-operators" .Values.clusterGroup.subscriptions.acm.source }}" }'
-    {{- end }}
+    installer.open-cluster-management.io/mce-subscription-spec: '{"source": "{{ default "redhat-operators" .Values.acm.mce_operator.source }}" {{- $channel }} }'
 spec: {}
diff --git a/acm/values.yaml b/acm/values.yaml
index fb7cb03a0..667bf89c8 100644
--- a/acm/values.yaml
+++ b/acm/values.yaml
@@ -30,6 +30,15 @@ clusterGroup:
 #      - name: clusterGroup
 #        value: region-one
 
+acm:
+  # Just used for IIB testing, drives the source and channel for the MCE
+  # subscription triggered by ACM
+  mce_operator:
+    source: redhat-operators
+    channel: null
+
+
+
 secretStore:
   name: vault-backend
   kind: ClusterSecretStore
diff --git a/tests/acm-industrial-edge-factory.expected.yaml b/tests/acm-industrial-edge-factory.expected.yaml
index 0291231a6..4f0ac7517 100644
--- a/tests/acm-industrial-edge-factory.expected.yaml
+++ b/tests/acm-industrial-edge-factory.expected.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-wave: "-1"
+    installer.open-cluster-management.io/mce-subscription-spec: '{"source": "redhat-operators" }'
 spec: {}
 ---
 # Source: acm/templates/policies/ocp-gitops-policy.yaml

From 8119368ab5387dc99c01021eea13138cb5f44294 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 30 Apr 2024 15:51:25 +0200
Subject: [PATCH 3/5] Update README for IIB changes

---
 ansible/roles/iib_ci/README.md | 38 +++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/iib_ci/README.md b/ansible/roles/iib_ci/README.md
index 6afccb1a7..36784ed52 100644
--- a/ansible/roles/iib_ci/README.md
+++ b/ansible/roles/iib_ci/README.md
@@ -38,6 +38,8 @@ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patc
 oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}}}}'
 ```
 
+### Gitops operator
+
 Then in case of the `openshift-gitops-operator` we would install with:
 
 ```sh
@@ -45,16 +47,42 @@ export CHANNEL=$(oc get -n openshift-marketplace packagemanifests -l "catalog=ii
 make EXTRA_HELM_OPTS="--set main.gitops.operatorSource=iib-${IIB} --set main.gitops.channel=${CHANNEL}" install
 ```
 
-To install ACM (`export OPERATOR=advanced-cluster-management`) or any other
-operator (except the gitops one) from an IIB we would call the following as a
-final step:
+### ACM operator
+
+The advanced-cluster-management operator is a little bit more complex than the others because it
+also installes another operator called MCE multicluster-engine. So to install ACM you typically
+need two IIBs (one for acm and one for mce). With those two at hand, do the following (the ordering must be
+consistent: the first IIB corresponds to the first OPERATOR, etc).
+
+```sh
+export OPERATOR=advanced-cluster-management,multicluster-engine
+export INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:713808,registry-proxy.engineering.redhat.com/rh-osbs/iib:718034
+make load-iib
+```
+
+Once the IIBs are loaded into the cluster we need to run the following steps:
+
+```sh
+export ACM_CHANNEL=$(oc get -n openshift-marketplace packagemanifests -l "catalog=iib-713808" --field-selector "metadata.name=advanced-cluster-management" -o jsonpath='{.items[0].status.defaultChannel}')
+export MCE_CHANNEL=$(oc get -n openshift-margetplace packagemanifests -l "catalog=iib-718034" --field-selector "metadata.name=multicluster-engine" -o jsonpath='{.items[0].status.defaultChannel}')
+make EXTRA_HELM_OPTS="--set main.extraParameters[0].name=clusterGroup.subscriptions.acm.source --set main.extraParameters[0].value=iib-713808 \
+                      --set main.extraParameters[1].name=clusterGroup.subscriptions.acm.channel --set main.extraParameters[1].value=${ACM_CHANNEL} \
+                      --set main.extraParameters[2].name=acm.mce_operator.source --set main.extraParameters[2].value="iib-718034" \
+                      --set main.extraParameters[3].name=acm.mce_operator.channel --set main.extraParameters[3].value=${MCE_CHANNEL}" install
+```
+
+*Note*: In this case the `acm` in `clusterGroup.subscriptions.acm.*` is the name of the key in the subscriptions in `values-hub.yaml`
+
+### Other operators
+
+To install operators other than gitops and acm do the following:
 
 ```sh
 export CHANNEL=$(oc get -n openshift-marketplace packagemanifests -l "catalog=iib-${IIB}" --field-selector "metadata.name=${OPERATOR}" -o jsonpath='{.items[0].status.defaultChannel}')
-make EXTRA_HELM_OPTS="--set main.extraParameters[0].name=clusterGroup.subscriptions.acm.source --set main.extraParameters[0].value=iib-${IIB} --set main.extraParameters[1].name=clusterGroup.subscriptions.acm.channel --set main.extraParameters[1].value=${CHANNEL}" install
+make EXTRA_HELM_OPTS="--set main.extraParameters[0].name=clusterGroup.subscriptions.<subname>.source --set main.extraParameters[0].value=iib-${IIB} --set main.extraParameters[1].name=clusterGroup.subscriptions.<subname>.channel --set main.extraParameters[1].value=${CHANNEL}" install
 ```
 
-*Note*: In this case `acm` is the name of the subscription in `values-hub.yaml`
+*Note*: Replace `<subname>` with the actual name of the subscription dictionary in `values-hub.yaml`
 
 ## Useful commands
 

From 6a4e5c69f558d4cd689faabbfccb208142c739b2 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Thu, 2 May 2024 15:28:20 +0200
Subject: [PATCH 4/5] Release clustergroup v0.8.5

---
 clustergroup/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clustergroup/Chart.yaml b/clustergroup/Chart.yaml
index c8ba873fc..e2d4f98b6 100644
--- a/clustergroup/Chart.yaml
+++ b/clustergroup/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart to create per-clustergroup ArgoCD applications and any
 keywords:
 - pattern
 name: clustergroup
-version: 0.8.4
+version: 0.8.5

From f835e10ff6fa947ac088f072417782e50db54482 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Thu, 2 May 2024 17:47:35 +0200
Subject: [PATCH 5/5] Update tests after common rebase

---
 tests/common-acm-industrial-edge-factory.expected.yaml        | 3 ++-
 tests/common-acm-industrial-edge-hub.expected.yaml            | 2 +-
 tests/common-acm-medical-diagnosis-hub.expected.yaml          | 2 +-
 tests/common-acm-naked.expected.yaml                          | 2 +-
 tests/common-acm-normal.expected.yaml                         | 2 +-
 ...mon-operator-install-industrial-edge-factory.expected.yaml | 4 ++--
 .../common-operator-install-industrial-edge-hub.expected.yaml | 4 ++--
 ...ommon-operator-install-medical-diagnosis-hub.expected.yaml | 4 ++--
 tests/common-operator-install-naked.expected.yaml             | 4 ++--
 tests/common-operator-install-normal.expected.yaml            | 4 ++--
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/common-acm-industrial-edge-factory.expected.yaml b/tests/common-acm-industrial-edge-factory.expected.yaml
index 0291231a6..561fbd7ba 100644
--- a/tests/common-acm-industrial-edge-factory.expected.yaml
+++ b/tests/common-acm-industrial-edge-factory.expected.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: open-cluster-management
   annotations:
     argocd.argoproj.io/sync-wave: "-1"
+    installer.open-cluster-management.io/mce-subscription-spec: '{"source": "redhat-operators" }'
 spec: {}
 ---
 # Source: acm/templates/policies/ocp-gitops-policy.yaml
@@ -109,7 +110,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/common-acm-industrial-edge-hub.expected.yaml b/tests/common-acm-industrial-edge-hub.expected.yaml
index 21a1c30d3..453e8a9e5 100644
--- a/tests/common-acm-industrial-edge-hub.expected.yaml
+++ b/tests/common-acm-industrial-edge-hub.expected.yaml
@@ -316,7 +316,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/common-acm-medical-diagnosis-hub.expected.yaml b/tests/common-acm-medical-diagnosis-hub.expected.yaml
index 40df35e2b..8b50de7a7 100644
--- a/tests/common-acm-medical-diagnosis-hub.expected.yaml
+++ b/tests/common-acm-medical-diagnosis-hub.expected.yaml
@@ -307,7 +307,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/common-acm-naked.expected.yaml b/tests/common-acm-naked.expected.yaml
index 4f0ac7517..561fbd7ba 100644
--- a/tests/common-acm-naked.expected.yaml
+++ b/tests/common-acm-naked.expected.yaml
@@ -110,7 +110,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/common-acm-normal.expected.yaml b/tests/common-acm-normal.expected.yaml
index 20a38d52c..66f1c5900 100644
--- a/tests/common-acm-normal.expected.yaml
+++ b/tests/common-acm-normal.expected.yaml
@@ -806,7 +806,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: gitops-1.11
+                  channel: gitops-1.12
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators
diff --git a/tests/common-operator-install-industrial-edge-factory.expected.yaml b/tests/common-operator-install-industrial-edge-factory.expected.yaml
index f1950e9e8..17cb63faf 100644
--- a/tests/common-operator-install-industrial-edge-factory.expected.yaml
+++ b/tests/common-operator-install-industrial-edge-factory.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: true
diff --git a/tests/common-operator-install-industrial-edge-hub.expected.yaml b/tests/common-operator-install-industrial-edge-hub.expected.yaml
index f1950e9e8..17cb63faf 100644
--- a/tests/common-operator-install-industrial-edge-hub.expected.yaml
+++ b/tests/common-operator-install-industrial-edge-hub.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: true
diff --git a/tests/common-operator-install-medical-diagnosis-hub.expected.yaml b/tests/common-operator-install-medical-diagnosis-hub.expected.yaml
index f1950e9e8..17cb63faf 100644
--- a/tests/common-operator-install-medical-diagnosis-hub.expected.yaml
+++ b/tests/common-operator-install-medical-diagnosis-hub.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: true
diff --git a/tests/common-operator-install-naked.expected.yaml b/tests/common-operator-install-naked.expected.yaml
index 22145c15f..ada9ab185 100644
--- a/tests/common-operator-install-naked.expected.yaml
+++ b/tests/common-operator-install-naked.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
diff --git a/tests/common-operator-install-normal.expected.yaml b/tests/common-operator-install-normal.expected.yaml
index f1950e9e8..17cb63faf 100644
--- a/tests/common-operator-install-normal.expected.yaml
+++ b/tests/common-operator-install-normal.expected.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: openshift-operators
 data:
   gitops.catalogSource: redhat-operators
-  gitops.channel: gitops-1.11
+  gitops.channel: gitops-1.12
 
   # gitops.sourceNamespace: GitOpsDefaultCatalogSourceNamespace
   # gitops.installApprovalPlan: GitOpsDefaultApprovalPlan
@@ -26,7 +26,7 @@ spec:
     targetRepo: https://github.com/pattern-clone/mypattern
     targetRevision: main 
   gitOpsSpec:
-    operatorChannel: gitops-1.11
+    operatorChannel: gitops-1.12
     operatorSource: redhat-operators
   multiSourceConfig:
     enabled: true