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

k8s: Replaces content in Install pod network add-on w symlinks. #393

Merged
merged 7 commits into from
Feb 12, 2019

Conversation

mvincerx
Copy link
Contributor

@mvincerx mvincerx commented Feb 8, 2019

Signed-off-by: Michael Vincerra michael.vincerra@intel.com

- Provides bash script to manage default plugin_dir
- Closes clearlinux#392

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
@mvincerx
Copy link
Contributor Author

mvincerx commented Feb 8, 2019

@pohly, Please review asap.
@DnPlas, @eadamsintel, Could one of you also review and approve this asap?
@mythi, FYI only.

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
- Closes Issue clearlinux#388

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
source/clear-linux/tutorials/kubernetes.rst Outdated Show resolved Hide resolved
source/clear-linux/tutorials/kubernetes.rst Outdated Show resolved Hide resolved
Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
If you are using CRI-O and `flannel` and you want to use Kata Containers, edit the :file:`/etc/crio/crio.conf` file to add:
The CRI-O default plugin_dir is :file:`/opt/cni/bin`. This must be a
writable directory because third-party networking add-ons will install
themselves there.
Copy link

Choose a reason for hiding this comment

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

Now you have this "The CRI-O default plugin_dir is..." note twice in the text.

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
Copy link

@pohly pohly left a comment

Choose a reason for hiding this comment

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

I personally would clean up the commits before merging, but other than that does the overall diff look okay now.

source/clear-linux/tutorials/kubernetes/kubernetes.rst Outdated Show resolved Hide resolved
@mvincerx
Copy link
Contributor Author

@mythi, Can you please provide any final feedback by Tuesday 12 Feb.?

@mythi
Copy link
Contributor

mythi commented Feb 12, 2019

@mvincerx looks good to me! Thanks @pohly too

@mvincerx
Copy link
Contributor Author

Thanks, all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants