Skip to content
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

Merged

Conversation

joelddiaz
Copy link
Contributor

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.

@joelddiaz
Copy link
Contributor Author

/retest

Comment on lines 354 to 357
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
Copy link
Contributor

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?

Copy link
Contributor Author

@joelddiaz joelddiaz Apr 8, 2020

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 ).
@abhinavdahiya
Copy link
Contributor

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2020
@openshift-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

@joelddiaz: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 6c2d3b2 link /test e2e-aws-scaleup-rhel7
ci/prow/e2e-libvirt 7e2b0ad link /test e2e-libvirt
ci/prow/e2e-openstack 7e2b0ad link /test e2e-openstack

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.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 75738a3 into openshift:master Apr 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants