OCPBUGS-74350: Add nodeSelector and tolerations to collect-profiles#1214
OCPBUGS-74350: Add nodeSelector and tolerations to collect-profiles#1214tmshort wants to merge 1 commit intoopenshift:mainfrom
Conversation
openshift-ci-robot
added
jira/valid-reference
|
@tmshort: This pull request references Jira Issue OCPBUGS-74350, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tmshort The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
|
/jira refresh |
|
@tmshort: This pull request references Jira Issue OCPBUGS-74350, which is invalid:
Comment DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@tmshort: This pull request references Jira Issue OCPBUGS-74350, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
tmshort
force-pushed
the
OCPBUGS-74350
branch
from
ba33735 to
132d349
Compare
This makes sense because olm workloads are control-plane components so ensuring these jobs are also on the same node ensures proximity. |
Ensure that the collect-profiles job is run on control-plane nodes. Signed-off-by: Todd Short <todd.short@me.com>
tmshort
force-pushed
the
OCPBUGS-74350
branch
from
132d349 to
5315233
Compare
|
/retest-required |
|
Test passed. Details: 1. Build an OCP cluster with this PR
launch 4.22,openshift/operator-framework-olm#1214 aws
jiazha-mac:~ jiazha$ oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.22.0-0-2026-02-03-021348-test-ci-ln-mvsxbhb-latest True False 3m16s Cluster version is 4.22.0-0-2026-02-03-021348-test-ci-ln-mvsxbhb-latest
jiazha-mac:~ jiazha$
jiazha-mac:~ jiazha$ oc get nodes
NAME STATUS ROLES AGE VERSION
ip-10-0-108-71.ec2.internal Ready worker 20m v1.34.2
ip-10-0-116-12.ec2.internal Ready control-plane,master 37m v1.34.2
ip-10-0-13-210.ec2.internal Ready control-plane,master 36m v1.34.2
ip-10-0-43-222.ec2.internal Ready worker 19m v1.34.2
ip-10-0-47-180.ec2.internal Ready control-plane,master 36m v1.34.2
ip-10-0-54-76.ec2.internal Ready worker 27m v1.34.2
2. Check the collect-profiles pods if running on the control-plane nodes.
jiazha-mac:~ jiazha$ oc get pods -o wide -n openshift-operator-lifecycle-manager -l app=olm-collect-profiles
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
collect-profiles-29501445-5m84v 0/1 Completed 0 31m 10.130.0.59 ip-10-0-47-180.ec2.internal <none> <none>
collect-profiles-29501460-48qxm 0/1 Completed 0 16m 10.129.0.77 ip-10-0-116-12.ec2.internal <none> <none>
collect-profiles-29501475-msjgz 0/1 Completed 0 111s 10.129.0.79 ip-10-0-116-12.ec2.internal <none> <none>
All of them running on the master node. LGTM./verified by @jianzhangbjz |
openshift-ci-robot
added
the
verified
|
@jianzhangbjz: This PR has been marked as verified by DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
| nodeSelector: | ||
| node-role.kubernetes.io/master: "" | ||
| tolerations: | ||
| - key: node-role.kubernetes.io/master |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
The verify should've caught that. So, if verify passed, not much I can do about it.
| secretName: pprof-cert | ||
| restartPolicy: Never | ||
| nodeSelector: | ||
| node-role.kubernetes.io/master: "" |
There was a problem hiding this comment.
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: ""There was a problem hiding this comment.
I tried, and it actually failed, so I put it back to master.
There was a problem hiding this comment.
Take a look at the original commit:
132d349
|
/lgtm |
|
/hold |
openshift-ci
Bot
added
the
do-not-merge/hold
|
/retest |
|
@tmshort: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
Closing in favor of #1215 |
|
@tmshort: This pull request references Jira Issue OCPBUGS-74350. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
4 participants
Ensure that the collect-profiles job is run on control-plane nodes.