Skip to content

OCPBUGS-74350: Add nodeSelector and tolerations to collect-profiles #1214

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
tmshort wants to merge 1 commit into from
Closed

OCPBUGS-74350: Add nodeSelector and tolerations to collect-profiles #1214

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
6 changes: 6 additions & 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 @@ -66,3 +66,9 @@ spec:
secret:
secretName: pprof-cert
restartPolicy: Never
nodeSelector:
node-role.kubernetes.io/master: ""
Copy link
Copy Markdown
Contributor

@jianzhangbjz jianzhangbjz Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we consider adding node-role.kubernetes.io/control-plane to improve forward compatibility in the future? Thanks!

jiazha-mac:~ jiazha$ oc get nodes ip-10-0-116-12.ec2.internal -o yaml | grep labels -A10|grep "node-role.kubernetes.io"
    node-role.kubernetes.io/control-plane: ""
    node-role.kubernetes.io/master: ""

Copy link
Copy Markdown
Contributor Author

@tmshort tmshort Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried, and it actually failed, so I put it back to master.

Copy link
Copy Markdown
Contributor Author

@tmshort tmshort Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take a look at the original commit:
132d349

tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
6 changes: 6 additions & 0 deletions microshift-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 @@ -66,3 +66,9 @@ spec:
secret:
secretName: pprof-cert
restartPolicy: Never
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
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 @@ -512,6 +512,12 @@ spec:
secret:
secretName: pprof-cert
restartPolicy: Never
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
Copy link
Copy Markdown
Contributor

@jianzhangbjz jianzhangbjz Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: The difference is that the manifest files use 2-space indentation before the list item (-), while the script has the list item at the same indentation level as the key.

Copy link
Copy Markdown
Contributor Author

@tmshort tmshort Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The verify should've caught that. So, if verify passed, not much I can do about it.

operator: Exists
effect: NoSchedule
EOF

cat << EOF > manifests/0000_50_olm_15-csv-viewer.rbac.yaml
Expand Down