From f6d417c0567626f407d7fc502c476b67e757cb1d Mon Sep 17 00:00:00 2001
From: Praveen Kumar <kumarpraveen.nitdgp@gmail.com>
Date: Tue, 22 Nov 2022 19:41:52 +0530
Subject: [PATCH] Remove operators from cvo override which are part of
 capabilities

In previous commit we added base capability which remove optional
operators. This PR remove duplicate of same operators from cvo
override list since it is not required.
---
 cvo-overrides-after-first-run.yaml | 59 +-----------------------------
 cvo-overrides.yaml                 | 51 +-------------------------
 2 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/cvo-overrides-after-first-run.yaml b/cvo-overrides-after-first-run.yaml
index a91391d2..a823cdd4 100644
--- a/cvo-overrides-after-first-run.yaml
+++ b/cvo-overrides-after-first-run.yaml
@@ -11,26 +11,6 @@
     name: monitoring
     namespace: ""
     unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: kube-storage-version-migrator-operator
-    namespace: openshift-kube-storage-version-migrator-operator
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: kube-storage-version-migrator
-    namespace: ""
-    unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: insights-operator
-    namespace: openshift-insights
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: insights
-    namespace: ""
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cloud-credential-operator
@@ -41,26 +21,6 @@
     name: cloud-credential
     namespace: ""
     unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: cluster-storage-operator
-    namespace: openshift-cluster-storage-operator
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: storage
-    namespace: ""
-    unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: cluster-baremetal-operator
-    namespace: openshift-machine-api
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: baremetal
-    namespace: ""
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cluster-autoscaler-operator
@@ -76,23 +36,6 @@
     name: csi-snapshot-controller-operator
     namespace: openshift-cluster-storage-operator
     unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: csi-snapshot-controller
-    namespace: ""
-    unmanaged: true
-  # only used in bootstrap phase
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: machine-api
-    namespace: ""
-    unmanaged: true
-  # required to scale down etcd-quorum-guard
-  - kind: Deployment
-    group: apps
-    name: etcd-quorum-guard
-    namespace: openshift-etcd
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cluster-cloud-controller-manager-operator
@@ -103,4 +46,4 @@
     name: cloud-controller-manager
     namespace: ""
     unmanaged: true
-
+ 
diff --git a/cvo-overrides.yaml b/cvo-overrides.yaml
index 1af0548d..dd218863 100644
--- a/cvo-overrides.yaml
+++ b/cvo-overrides.yaml
@@ -10,26 +10,6 @@ spec:
     name: monitoring
     namespace: ""
     unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: kube-storage-version-migrator-operator
-    namespace: openshift-kube-storage-version-migrator-operator
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: kube-storage-version-migrator
-    namespace: ""
-    unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: insights-operator
-    namespace: openshift-insights
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: insights
-    namespace: ""
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cloud-credential-operator
@@ -40,26 +20,6 @@ spec:
     name: cloud-credential
     namespace: ""
     unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: cluster-storage-operator
-    namespace: openshift-cluster-storage-operator
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: storage
-    namespace: ""
-    unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: cluster-baremetal-operator
-    namespace: openshift-machine-api
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: baremetal
-    namespace: ""
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cluster-autoscaler-operator
@@ -70,16 +30,6 @@ spec:
     name: cluster-autoscaler
     namespace: ""
     unmanaged: true
-  - kind: Deployment
-    group: apps
-    name: csi-snapshot-controller-operator
-    namespace: openshift-cluster-storage-operator
-    unmanaged: true
-  - kind: ClusterOperator
-    group: config.openshift.io
-    name: csi-snapshot-controller
-    namespace: ""
-    unmanaged: true
   - kind: Deployment
     group: apps
     name: cluster-cloud-controller-manager-operator
@@ -90,3 +40,4 @@ spec:
     name: cloud-controller-manager
     namespace: ""
     unmanaged: true
+