Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
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
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
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
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

This file was deleted.

47 changes: 0 additions & 47 deletions microshift-manifests/0000_50_olm_00-pprof-rbac.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions microshift-manifests/0000_50_olm_00-pprof-secret.yaml

This file was deleted.

68 changes: 0 additions & 68 deletions microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml

This file was deleted.

This file was deleted.

16 changes: 16 additions & 0 deletions scripts/generate_crds_manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,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 @@ -352,6 +353,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 @@ -369,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
subjects:
Expand All @@ -387,6 +390,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 @@ -400,6 +404,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 @@ -418,6 +423,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 @@ -463,6 +469,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 @@ -649,3 +656,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"