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.
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
handle the posibility that CCO will have no pod definition #3427
handle the posibility that CCO will have no pod definition #3427
Conversation
/retest |
cp cco-bootstrap/bootstrap-manifests/* bootstrap-manifests/ | ||
# skip copy if empty directory | ||
if find cco-bootstrap/bootstrap-manifests -mindepth 1 -print -quit | grep -q .; then | ||
cp cco-bootstrap/bootstrap-manifests/* bootstrap-manifests/ | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you switch this to the static pod file maybe instead of this list?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@abhinavdahiya can you clarify what you have in mind? are you suggesting putting down a static pod yaml file that just runs "sleep 3600" instead of starting up the CCO binary when CCO is determined to be disabled?
When disabling CCO, the bootstrap-manifests dir will be empty which will error bootkube.sh. Skip tyring to copy an empty directory by detecting whether the static pod manifest was rendered (the directory should always exist starting with openshift/cloud-credential-operator#175 ).
6c2d3b2
to
7e2b0ad
Compare
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/retest Please review the full test history for this PR and help us cut down flakes. |
@joelddiaz: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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 kubernetes/test-infra repository. I understand the commands that are listed here. |
/retest Please review the full test history for this PR and help us cut down flakes. |
When disabling CCO, the bootstrap-manifests dir will be empty which will error bootkube.sh when trying to copy the contents of the empty dir.
Detect the empty dir and avoid trying to copy the contents the empty dir in that situation.