From c5d5ac44c650adbe89f0cfa665053724dc6feb8b Mon Sep 17 00:00:00 2001 From: Lamya Gandhi Date: Wed, 22 Apr 2026 12:09:22 +0530 Subject: [PATCH 01/10] Fix: Change OperatorGroup to match exisiting resource --- .../templates/01-OperatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml index 54c2b57f5..e6063925f 100644 --- a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml +++ b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: cluster-logging-operator + name: openshift-logging namespace: openshift-logging annotations: argocd.argoproj.io/sync-wave: "054" From 89836c2aadf964428a22317dbed00689e4b2cd19 Mon Sep 17 00:00:00 2001 From: Lamya Gandhi Date: Wed, 22 Apr 2026 13:22:10 +0530 Subject: [PATCH 02/10] Fix: Change OperatorGroup to match exisiting resource-added comments --- .../templates/01-OperatorGroup.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml index e6063925f..f693113dc 100644 --- a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml +++ b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml @@ -1,4 +1,6 @@ --- +# OperatorGroup for OpenShift Logging Operator +# Name matches the default created by manual installation to avoid conflicts apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: From 6024163f10dc9395221b7b22e68f5fd8011791ef Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 23 Apr 2026 15:21:42 +0530 Subject: [PATCH 03/10] added annotation to efs operator group --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index e94efb415..c4cc11c50 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -6,6 +6,7 @@ metadata: namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" + argocd.argoproj.io/sync-options: ServerSideApply=true {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} From 37567b4579cbcde2fc35f22a02b5f7bb93404af9 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 23 Apr 2026 15:22:52 +0530 Subject: [PATCH 04/10] CHanged operator group name --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index c4cc11c50..833b6068a 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-operators + name: openshift-cluster-csi-drivers namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" From 56c7fe08eb68d98e5fdaad514779d3df616b6152 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 23 Apr 2026 16:55:26 +0530 Subject: [PATCH 05/10] Reverted Operator group name --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index 833b6068a..c4cc11c50 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-cluster-csi-drivers + name: openshift-operators namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" From 171a37cbb9d7875f46fca3de39c6737f82be9d2a Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 23 Apr 2026 19:44:54 +0530 Subject: [PATCH 06/10] Generate name for efs operator group --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index c4cc11c50..a8d8bed1b 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-operators + generateName: openshift-cluster-csi-drivers- namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" From e96e6ace29db339ef33136d07e203e4d5cc5811c Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 23 Apr 2026 21:18:53 +0530 Subject: [PATCH 07/10] Changed OperatorGroup name --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index a8d8bed1b..833b6068a 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - generateName: openshift-cluster-csi-drivers- + name: openshift-cluster-csi-drivers namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" From 6814b81f31ea3eb1b11bfc432df03f13d951ea02 Mon Sep 17 00:00:00 2001 From: Lamya Gandhi Date: Fri, 24 Apr 2026 11:54:52 +0530 Subject: [PATCH 08/10] Removed Comments --- .../templates/01-OperatorGroup.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml index f693113dc..e6063925f 100644 --- a/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml +++ b/cluster-applications/054-cluster-logging-operator/templates/01-OperatorGroup.yaml @@ -1,6 +1,4 @@ --- -# OperatorGroup for OpenShift Logging Operator -# Name matches the default created by manual installation to avoid conflicts apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: From 3d49bfda2c23d17be65c97fb8b7a71a92b1fcf65 Mon Sep 17 00:00:00 2001 From: Lamya Gandhi Date: Mon, 27 Apr 2026 14:31:18 +0530 Subject: [PATCH 09/10] MASCORE-13413: Link branch to Jira issue From f343f9b0b3cf26ad960b8b0fafdd0dc64c5c253e Mon Sep 17 00:00:00 2001 From: Lamya Gandhi Date: Tue, 28 Apr 2026 11:57:29 +0530 Subject: [PATCH 10/10] Add ApplyOutOfSyncOnly=true syncPolicy to all ApplicationSets --- .../templates/070-aiservice-tenant-appset.yaml | 1 + .../ibm-mas-account-root/templates/000-cluster-appset.yaml | 1 + .../ibm-mas-cluster-root/templates/065-sls-appset.yaml | 1 + .../templates/099-aiservice-instance-appset.yaml | 1 + .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml index a7c440c3a..fdcbe9c32 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml @@ -107,6 +107,7 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true - ServerSideApply=true + - ApplyOutOfSyncOnly=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index 6e97e8d6f..3f290bb0f 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -178,3 +178,4 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true - ServerSideApply=true + - ApplyOutOfSyncOnly=true diff --git a/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml index 944e08351..853de885d 100644 --- a/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml @@ -100,6 +100,7 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true - ServerSideApply=true + - ApplyOutOfSyncOnly=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml index 34832b9d8..5990bf3a8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml @@ -112,6 +112,7 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true - ServerSideApply=true + - ApplyOutOfSyncOnly=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index fa8a196fa..06016bdf7 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -228,6 +228,7 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true - ServerSideApply=true + - ApplyOutOfSyncOnly=true retry: limit: -1 ignoreDifferences: