diff --git a/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml b/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml deleted file mode 100644 index 5b7c985a68..0000000000 --- a/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "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 deleted file mode 100644 index f5a6d270c8..0000000000 --- a/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" diff --git a/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml b/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml deleted file mode 100644 index a81ccd8ce2..0000000000 --- a/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" diff --git a/microshift-manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml b/microshift-manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml deleted file mode 100644 index 5b7c985a68..0000000000 --- a/microshift-manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" diff --git a/microshift-manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml b/microshift-manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml deleted file mode 100644 index f5a6d270c8..0000000000 --- a/microshift-manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" diff --git a/microshift-manifests/0000_50_olm_14-packageserver.subscription.removed.yaml b/microshift-manifests/0000_50_olm_14-packageserver.subscription.removed.yaml deleted file mode 100644 index a81ccd8ce2..0000000000 --- a/microshift-manifests/0000_50_olm_14-packageserver.subscription.removed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" - capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh index f159e6250a..cf5e345b92 100755 --- a/scripts/generate_crds_manifests.sh +++ b/scripts/generate_crds_manifests.sh @@ -523,37 +523,6 @@ 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 - cat << EOF > manifests/0000_50_olm_15-csv-viewer.rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: Role