Skip to content

[WIP] OCPBUGS-31547: UPSTREAM: <carry>: disable collect-profiles cronjob #730

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

Closed
perdasilva wants to merge 1 commit into from
Closed

[WIP] OCPBUGS-31547: UPSTREAM: <carry>: disable collect-profiles cronjob #730

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_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
namespace: openshift-operator-lifecycle-manager
Expand Down
64 changes: 0 additions & 64 deletions microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml
View file
Open in desktop

This file was deleted.

6 changes: 6 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 @@ -371,6 +371,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
spec:
Expand Down Expand Up @@ -555,3 +556,8 @@ ${SED} -i '/- --writeStatusName/,+3d' ${ROOT_DIR}/microshift-manifests/0000_50_o

# Replace the namespace openshift, as it doesn't exist on microshift, in the rbac file
${SED} -i 's/ namespace: openshift/ namespace: openshift-operator-lifecycle-manager/g' ${ROOT_DIR}/microshift-manifests/0000_50_olm_15-csv-viewer.rbac.yaml

# Deleting manifests from CVO takes multiple releases. an annotation was added in 4.16 development to remove the collect-profiles job
# from the CVO payload. For microshift, since there is no CVO payload and no in process upgrade, let's delete this now. In 4.17 development,
# the CVO manifest should be deleted and this step should be removed.
rm "${ROOT_DIR}/microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml"