Skip to content

Commit ba51f79

Browse files
Merge pull request #1251 from openshift-cherrypick-robot/cherry-pick-1250-to-release-4.16
[release-4.16] OCPBUGS-77959: Remove the collect-profiles info from the microshift kustomization file
2 parents 5a6ac6f + 72d3e6f commit ba51f79

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

microshift-manifests/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ resources:
1010
- 0000_50_olm_00-operatorgroups.crd.yaml
1111
- 0000_50_olm_00-operators.crd.yaml
1212
- 0000_50_olm_00-packageserver.pdb.yaml
13-
- 0000_50_olm_00-pprof-config.yaml
14-
- 0000_50_olm_00-pprof-rbac.yaml
15-
- 0000_50_olm_00-pprof-secret.yaml
1613
- 0000_50_olm_00-subscriptions.crd.yaml
1714
- 0000_50_olm_01-networkpolicies.yaml
1815
- 0000_50_olm_01-olm-operator.serviceaccount.yaml

scripts/generate_crds_manifests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ microshift_manifests_files=$(find "${ROOT_DIR}/microshift-manifests" -type f -na
538538
# Let's sort the files so that we can have a deterministic order
539539
microshift_manifests_files=$(echo "${microshift_manifests_files}" | sort)
540540
# files to ignore, substring match.
541-
files_to_ignore=("ibm-cloud-managed.yaml" "kustomization.yaml" "psm-operator" "removed" "collect-profiles" "prometheus" "service-monitor" "operatorstatus")
541+
files_to_ignore=("ibm-cloud-managed.yaml" "kustomization.yaml" "psm-operator" "removed" "collect-profiles" "pprof" "prometheus" "service-monitor" "operatorstatus")
542542

543543
# Add all the manifests files to the kustomization file while ignoring the files in the files_to_ignore list
544544
for file in ${microshift_manifests_files}; do

0 commit comments

Comments
 (0)