Merge pull request #610 from jmprusi/jmprusi/microshift-ignore-removed-files

OPRUN-3063: Microshift manifests: Ignore "*.removed.yaml" files in kustomization.yaml

Author: openshift-merge-bot[bot]

microshift-manifests/kustomization.yaml

@@ -21,10 +21,7 @@ resources:
   - 0000_50_olm_07-olm-operator.deployment.yaml
   - 0000_50_olm_08-catalog-operator.deployment.yaml
   - 0000_50_olm_09-aggregated.clusterrole.yaml
-  - 0000_50_olm_11-olm-operators.configmap.removed.yaml
-  - 0000_50_olm_12-olm-operators.catalogsource.removed.yaml
   - 0000_50_olm_13-operatorgroup-default.yaml
-  - 0000_50_olm_14-packageserver.subscription.removed.yaml
   - 0000_50_olm_15-csv-viewer.rbac.yaml
   - 0000_50_olm_99-operatorstatus.yaml
   - 0000_90_olm_00-service-monitor.yaml

scripts/generate_crds_manifests.sh

@@ -520,7 +520,7 @@ microshift_manifests_files=$(find "${ROOT_DIR}/microshift-manifests" -type f -na
 # Let's sort the files so that we can have a deterministic order
 microshift_manifests_files=$(echo "${microshift_manifests_files}" | sort)
 # files to ignore, substring match.
-files_to_ignore=("ibm-cloud-managed.yaml" "kustomization.yaml" "psm-operator")
+files_to_ignore=("ibm-cloud-managed.yaml" "kustomization.yaml" "psm-operator" "removed")
 
 # Add all the manifests files to the kustomization file while ignoring the files in the files_to_ignore list
 for file in ${microshift_manifests_files}; do