Skip to content

OCPBUGS-31547: Remove the collect-profiles job #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 5, 2026
Merged

OCPBUGS-31547: Remove the collect-profiles job #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/0000_50_olm_00-pprof-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
name: collect-profiles-config
namespace: openshift-operator-lifecycle-manager
Expand Down
3 changes: 3 additions & 0 deletions manifests/0000_50_olm_00-pprof-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
Expand All @@ -23,6 +24,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
Expand All @@ -42,6 +44,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
1 change: 1 addition & 0 deletions manifests/0000_50_olm_00-pprof-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
release.openshift.io/delete: "true"
openshift.io/owning-component: "Operator Framework / operator-lifecycle-manager"
capability.openshift.io/name: "OperatorLifecycleManager"
name: pprof-cert
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
name: collect-profiles
labels:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_olm_07-collect-profiles.networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
include.release.openshift.io/hypershift: "true"
spec:
Expand Down
14 changes: 0 additions & 14 deletions microshift-manifests/0000_50_olm_00-pprof-config.yaml
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions microshift-manifests/0000_50_olm_00-pprof-rbac.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions microshift-manifests/0000_50_olm_00-pprof-secret.yaml
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions microshift-manifests/0000_50_olm_07-collect-profiles.networkpolicy.yaml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions scripts/generate_crds_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ metadata:
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
release.openshift.io/delete: "true"
name: collect-profiles-config
namespace: openshift-operator-lifecycle-manager
data:
Expand All @@ -341,6 +342,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
rules:
Expand All @@ -358,6 +360,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
subjects:
Expand All @@ -376,6 +379,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
name: collect-profiles
namespace: openshift-operator-lifecycle-manager
EOF
Expand All @@ -389,6 +393,7 @@ metadata:
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
release.openshift.io/delete: "true"
openshift.io/owning-component: "Operator Framework / operator-lifecycle-manager"
name: pprof-cert
namespace: openshift-operator-lifecycle-manager
Expand All @@ -407,6 +412,7 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
include.release.openshift.io/hypershift: "true"
spec:
Expand Down Expand Up @@ -452,6 +458,7 @@ metadata:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
name: collect-profiles
labels:
app: olm-collect-profiles
Expand Down Expand Up @@ -638,3 +645,12 @@ done

# replace input with output
mv "${filtered_yaml}" "${yaml_file}"

# Deleting manifests from CVO takes multiple releases. an annotation was added in 4.22 development to remove the collect-profiles
# resources from the CVO payload. For microshift, since there is no CVO payload and no in process upgrade, let's delete these now.
# In 4.23 development, the CVO manifests should be deleted and this step should be removed.
rm -f "${ROOT_DIR}/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml"
rm -f "${ROOT_DIR}/microshift-manifests/0000_50_olm_07-collect-profiles.networkpolicy.yaml"
rm -f "${ROOT_DIR}/microshift-manifests/0000_50_olm_00-pprof-config.yaml"
rm -f "${ROOT_DIR}/microshift-manifests/0000_50_olm_00-pprof-rbac.yaml"
rm -f "${ROOT_DIR}/microshift-manifests/0000_50_olm_00-pprof-secret.yaml"