From 0bb2c07f6f9aa26ba609b8bb5128758d483d654b Mon Sep 17 00:00:00 2001
From: kevinrizza <krizza@redhat.com>
Date: Wed, 5 Jan 2022 10:36:31 -0500
Subject: [PATCH] Bug 2037168: Remove incorrect cvo annotations

The single-node-developer profile was ultimately not implemented, and as
a result is ultimately unnecessary. This commit removes it from all
manifests
see  https://github.com/openshift/cluster-version-operator/pull/685

Additionally, the ibm-cloud-managed annotation and self-managed
annotations are applied to both versions of the psm deployment manifest.
Since these are in conflict, in the future they could potentially cause
flapping by the CVO to apply both versions of the manifest to the
cluster.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2037168
---
 manifests/0000_50_olm_00-catalogsources.crd.yaml         | 1 -
 manifests/0000_50_olm_00-clusterserviceversions.crd.yaml | 1 -
 manifests/0000_50_olm_00-installplans.crd.yaml           | 1 -
 manifests/0000_50_olm_00-namespace.yaml                  | 2 --
 manifests/0000_50_olm_00-olmconfigs.crd.yaml             | 1 -
 manifests/0000_50_olm_00-operatorconditions.crd.yaml     | 1 -
 manifests/0000_50_olm_00-operatorgroups.crd.yaml         | 1 -
 manifests/0000_50_olm_00-operators.crd.yaml              | 1 -
 manifests/0000_50_olm_00-packageserver.pdb.yaml          | 1 -
 manifests/0000_50_olm_00-pprof-config.yaml               | 1 -
 manifests/0000_50_olm_00-pprof-rbac.yaml                 | 3 ---
 manifests/0000_50_olm_00-pprof-secret.yaml               | 1 -
 manifests/0000_50_olm_00-subscriptions.crd.yaml          | 1 -
 .../0000_50_olm_01-olm-operator.serviceaccount.yaml      | 3 ---
 manifests/0000_50_olm_02-olmconfig.yaml                  | 1 -
 manifests/0000_50_olm_02-services.yaml                   | 2 --
 ...olm_06-psm-operator.deployment.ibm-cloud-managed.yaml | 2 --
 manifests/0000_50_olm_06-psm-operator.deployment.yaml    | 1 -
 manifests/0000_50_olm_07-collect-profiles.cronjob.yaml   | 1 -
 manifests/0000_50_olm_07-olm-operator.deployment.yaml    | 1 -
 .../0000_50_olm_08-catalog-operator.deployment.yaml      | 1 -
 manifests/0000_50_olm_09-aggregated.clusterrole.yaml     | 2 --
 manifests/0000_50_olm_13-operatorgroup-default.yaml      | 2 --
 manifests/0000_50_olm_99-operatorstatus.yaml             | 3 ---
 manifests/0000_90_olm_00-service-monitor.yaml            | 4 ----
 manifests/0000_90_olm_01-prometheus-rule.yaml            | 1 -
 pkg/manifests/csv.yaml                                   | 1 -
 scripts/generate_crds_manifests.sh                       | 9 ---------
 scripts/packageserver-deployment.patch.yaml              | 1 -
 29 files changed, 51 deletions(-)

diff --git a/manifests/0000_50_olm_00-catalogsources.crd.yaml b/manifests/0000_50_olm_00-catalogsources.crd.yaml
index e2c317a9f1..c32ea2be6f 100644
--- a/manifests/0000_50_olm_00-catalogsources.crd.yaml
+++ b/manifests/0000_50_olm_00-catalogsources.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: catalogsources.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml b/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
index e00c809741..726547b388 100644
--- a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
+++ b/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: clusterserviceversions.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-installplans.crd.yaml b/manifests/0000_50_olm_00-installplans.crd.yaml
index caca9039dd..a600554030 100644
--- a/manifests/0000_50_olm_00-installplans.crd.yaml
+++ b/manifests/0000_50_olm_00-installplans.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: installplans.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-namespace.yaml b/manifests/0000_50_olm_00-namespace.yaml
index 8ad84c8ba6..fc1de8ca9b 100644
--- a/manifests/0000_50_olm_00-namespace.yaml
+++ b/manifests/0000_50_olm_00-namespace.yaml
@@ -7,7 +7,6 @@ metadata:
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   labels:
     openshift.io/scc: "anyuid"
     openshift.io/cluster-monitoring: "true"
@@ -21,6 +20,5 @@ metadata:
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   labels:
     openshift.io/scc: "anyuid"
diff --git a/manifests/0000_50_olm_00-olmconfigs.crd.yaml b/manifests/0000_50_olm_00-olmconfigs.crd.yaml
index c15a06fb5b..5c1aa492f9 100644
--- a/manifests/0000_50_olm_00-olmconfigs.crd.yaml
+++ b/manifests/0000_50_olm_00-olmconfigs.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: olmconfigs.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-operatorconditions.crd.yaml b/manifests/0000_50_olm_00-operatorconditions.crd.yaml
index 5a494000ac..158212d858 100644
--- a/manifests/0000_50_olm_00-operatorconditions.crd.yaml
+++ b/manifests/0000_50_olm_00-operatorconditions.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: operatorconditions.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-operatorgroups.crd.yaml b/manifests/0000_50_olm_00-operatorgroups.crd.yaml
index 0a1c2d1090..211ecd4c9b 100644
--- a/manifests/0000_50_olm_00-operatorgroups.crd.yaml
+++ b/manifests/0000_50_olm_00-operatorgroups.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: operatorgroups.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-operators.crd.yaml b/manifests/0000_50_olm_00-operators.crd.yaml
index 05a7736e18..744a205bfb 100644
--- a/manifests/0000_50_olm_00-operators.crd.yaml
+++ b/manifests/0000_50_olm_00-operators.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: operators.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_00-packageserver.pdb.yaml b/manifests/0000_50_olm_00-packageserver.pdb.yaml
index 133ec0c802..48918a7ac9 100644
--- a/manifests/0000_50_olm_00-packageserver.pdb.yaml
+++ b/manifests/0000_50_olm_00-packageserver.pdb.yaml
@@ -6,7 +6,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   maxUnavailable: 1
   selector:
diff --git a/manifests/0000_50_olm_00-pprof-config.yaml b/manifests/0000_50_olm_00-pprof-config.yaml
index ebf2a73ce6..0b728f9f58 100644
--- a/manifests/0000_50_olm_00-pprof-config.yaml
+++ b/manifests/0000_50_olm_00-pprof-config.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
   name: collect-profiles-config
   namespace: openshift-operator-lifecycle-manager
diff --git a/manifests/0000_50_olm_00-pprof-rbac.yaml b/manifests/0000_50_olm_00-pprof-rbac.yaml
index 35e09b6f3b..df1cb9b187 100644
--- a/manifests/0000_50_olm_00-pprof-rbac.yaml
+++ b/manifests/0000_50_olm_00-pprof-rbac.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 rules:
@@ -21,7 +20,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 subjects:
@@ -39,6 +37,5 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
diff --git a/manifests/0000_50_olm_00-pprof-secret.yaml b/manifests/0000_50_olm_00-pprof-secret.yaml
index 75f211d7ed..eebecd82b6 100644
--- a/manifests/0000_50_olm_00-pprof-secret.yaml
+++ b/manifests/0000_50_olm_00-pprof-secret.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
   name: pprof-cert
   namespace: openshift-operator-lifecycle-manager
diff --git a/manifests/0000_50_olm_00-subscriptions.crd.yaml b/manifests/0000_50_olm_00-subscriptions.crd.yaml
index 201fa91f60..435980cff8 100644
--- a/manifests/0000_50_olm_00-subscriptions.crd.yaml
+++ b/manifests/0000_50_olm_00-subscriptions.crd.yaml
@@ -5,7 +5,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.6.2
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   name: subscriptions.operators.coreos.com
 spec:
diff --git a/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml b/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml
index 7d61dea49a..36726fc928 100644
--- a/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml
+++ b/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml
@@ -6,7 +6,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -15,7 +14,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 rules:
   - apiGroups: ["*"]
     resources: ["*"]
@@ -30,7 +28,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/manifests/0000_50_olm_02-olmconfig.yaml b/manifests/0000_50_olm_02-olmconfig.yaml
index f485ac7917..32eef2ecef 100644
--- a/manifests/0000_50_olm_02-olmconfig.yaml
+++ b/manifests/0000_50_olm_02-olmconfig.yaml
@@ -6,4 +6,3 @@ metadata:
     release.openshift.io/create-only: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
diff --git a/manifests/0000_50_olm_02-services.yaml b/manifests/0000_50_olm_02-services.yaml
index a57315d5bd..95cfebca85 100644
--- a/manifests/0000_50_olm_02-services.yaml
+++ b/manifests/0000_50_olm_02-services.yaml
@@ -7,7 +7,6 @@ metadata:
     service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   labels:
     app: olm-operator
 spec:
@@ -29,7 +28,6 @@ metadata:
     service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   labels:
     app: catalog-operator
 spec:
diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml
index a4526942ee..05740378ba 100644
--- a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml
+++ b/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml
@@ -6,8 +6,6 @@ metadata:
   labels:
     app: package-server-manager
   annotations:
-    include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
 spec:
   strategy:
diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.yaml
index 1ba777e57e..7ae0413b0a 100644
--- a/manifests/0000_50_olm_06-psm-operator.deployment.yaml
+++ b/manifests/0000_50_olm_06-psm-operator.deployment.yaml
@@ -7,7 +7,6 @@ metadata:
     app: package-server-manager
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   strategy:
     type: RollingUpdate
diff --git a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml b/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
index 29b99f87f7..6f61d51b15 100644
--- a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
+++ b/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 spec:
diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
index b699206559..232f3c3e0f 100644
--- a/manifests/0000_50_olm_07-olm-operator.deployment.yaml
+++ b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
@@ -7,7 +7,6 @@ metadata:
     app: olm-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   strategy:
     type: RollingUpdate
diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
index 07557ef036..1ef53f9c74 100644
--- a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
+++ b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -7,7 +7,6 @@ metadata:
     app: catalog-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   strategy:
     type: RollingUpdate
diff --git a/manifests/0000_50_olm_09-aggregated.clusterrole.yaml b/manifests/0000_50_olm_09-aggregated.clusterrole.yaml
index 92e921a10a..498f0da239 100644
--- a/manifests/0000_50_olm_09-aggregated.clusterrole.yaml
+++ b/manifests/0000_50_olm_09-aggregated.clusterrole.yaml
@@ -9,7 +9,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 rules:
   - apiGroups: ["operators.coreos.com"]
     resources: ["subscriptions"]
@@ -30,7 +29,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 rules:
   - apiGroups: ["operators.coreos.com"]
     resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
diff --git a/manifests/0000_50_olm_13-operatorgroup-default.yaml b/manifests/0000_50_olm_13-operatorgroup-default.yaml
index 35aca306c9..7d12692a02 100644
--- a/manifests/0000_50_olm_13-operatorgroup-default.yaml
+++ b/manifests/0000_50_olm_13-operatorgroup-default.yaml
@@ -6,7 +6,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
@@ -16,7 +15,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   targetNamespaces:
     - openshift-operator-lifecycle-manager
diff --git a/manifests/0000_50_olm_99-operatorstatus.yaml b/manifests/0000_50_olm_99-operatorstatus.yaml
index 9b95770e2c..359ce1f206 100644
--- a/manifests/0000_50_olm_99-operatorstatus.yaml
+++ b/manifests/0000_50_olm_99-operatorstatus.yaml
@@ -5,7 +5,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 status:
   versions:
     - name: operator
@@ -18,7 +17,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 status:
   versions:
     - name: operator
@@ -31,7 +29,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 status:
   versions:
     - name: operator
diff --git a/manifests/0000_90_olm_00-service-monitor.yaml b/manifests/0000_90_olm_00-service-monitor.yaml
index 18f77d035a..710a551cf1 100644
--- a/manifests/0000_90_olm_00-service-monitor.yaml
+++ b/manifests/0000_90_olm_00-service-monitor.yaml
@@ -6,7 +6,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 rules:
   - apiGroups:
       - ""
@@ -27,7 +26,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -47,7 +45,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -80,7 +77,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   jobLabel: k8s-app
   endpoints:
diff --git a/manifests/0000_90_olm_01-prometheus-rule.yaml b/manifests/0000_90_olm_01-prometheus-rule.yaml
index 91339cff5b..5d74a6734d 100644
--- a/manifests/0000_90_olm_01-prometheus-rule.yaml
+++ b/manifests/0000_90_olm_01-prometheus-rule.yaml
@@ -9,7 +9,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   groups:
     - name: olm.csv_abnormal.rules
diff --git a/pkg/manifests/csv.yaml b/pkg/manifests/csv.yaml
index 368b6dfcc7..76ded267f5 100644
--- a/pkg/manifests/csv.yaml
+++ b/pkg/manifests/csv.yaml
@@ -8,7 +8,6 @@ metadata:
     olm.version: 0.19.0
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
   annotations:
-    include.release.openshift.io/single-node-developer: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
 spec:
diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh
index 69636be167..7c0ad2af2e 100755
--- a/scripts/generate_crds_manifests.sh
+++ b/scripts/generate_crds_manifests.sh
@@ -55,7 +55,6 @@ add_ibm_managed_cloud_annotations() {
          ${YQ} d -d'*' --inplace "$g" 'spec.template.spec.nodeSelector."node-role.kubernetes.io/master"'
       fi
       ${YQ} w -d'*' --inplace --style=double "$f" 'metadata.annotations['include.release.openshift.io/self-managed-high-availability']' true
-      ${YQ} w -d'*' --inplace --style=double "$f" 'metadata.annotations['include.release.openshift.io/single-node-developer']' true
    done
 }
 
@@ -92,8 +91,6 @@ metadata:
   labels:
     app: package-server-manager
   annotations:
-    include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   strategy:
     type: RollingUpdate
@@ -172,7 +169,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
   name: collect-profiles-config
   namespace: openshift-operator-lifecycle-manager
@@ -188,7 +184,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 rules:
@@ -205,7 +200,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 subjects:
@@ -223,7 +217,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 EOF
@@ -235,7 +228,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
   name: pprof-cert
   namespace: openshift-operator-lifecycle-manager
@@ -252,7 +244,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 spec:
diff --git a/scripts/packageserver-deployment.patch.yaml b/scripts/packageserver-deployment.patch.yaml
index d66bacd633..18b03a4280 100644
--- a/scripts/packageserver-deployment.patch.yaml
+++ b/scripts/packageserver-deployment.patch.yaml
@@ -19,7 +19,6 @@
 - command: update
   path: metadata.annotations
   value:
-    include.release.openshift.io/single-node-developer: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
 - command: update