Merge pull request #245 from awgreene/bz-1975543

openshift-merge-robot · web-flow · commit 494df5aa9d10 · 2022-03-03T21:46:49.000-05:00
Bug 1975543: Use CVO to delete manifests removed from OLM
diff --git a/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml b/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: olm-operators
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
diff --git a/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml b/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml
@@ -0,0 +1,9 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: olm-operators
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
diff --git a/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml b/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml
@@ -0,0 +1,9 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: packageserver
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh
@@ -288,6 +288,37 @@ spec:
           restartPolicy: Never
 EOF
 
+cat << EOF > manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: olm-operators
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+EOF
+
+cat << EOF > manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: olm-operators
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+
+EOF
+
+cat << EOF > manifests/0000_50_olm_14-packageserver.subscription.removed.yaml
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: packageserver
+  namespace: openshift-operator-lifecycle-manager
+  annotations:
+    release.openshift.io/delete: "true"
+EOF
+
 add_ibm_managed_cloud_annotations "${ROOT_DIR}/manifests"
 
 # requires gnu sed if on mac
