dind: Fix crio configuration #19251
Merged
dind: Fix crio configuration #19251
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/XS
rajatchopra
reviewed
Apr 9, 2018
| @@ -91,3 +91,5 @@ RUN systemctl enable crio-node.service | |||
|
|
|||
| # Default crio storage to vfs. overlay on overlayfs is not supported in crio. | |||
| RUN echo "CRIO_STORAGE_OPTIONS=--storage-driver vfs" > /etc/sysconfig/crio-storage | |||
| RUN sed -i 's/^plugin_dir .*/plugin_dir = "\/opt\/cni\/bin\/"/g' /etc/crio/crio.conf | |||
There was a problem hiding this comment.
Because crio defaults plugin_dir to /usr/libexec/cni/ on Fedora and we install/expect openshift sdn plugin to be present under /opt/cni/bin dir.
There was a problem hiding this comment.
@pravisankar BTW when Kube 1.11 merges to Origin we can then pass --cni-bin-dir=/usr/libexec/cni to kubelet.
|
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dcbw, pravisankar 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 |
openshift-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.