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.

Sign up for GitHub

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

Jump to bottom

Add CRI installation instructions page #10299

Merged
merged 1 commit into from Sep 19, 2018
Merged

Add CRI installation instructions page #10299

merged 1 commit into from Sep 19, 2018

Conversation

bart0sh
Copy link
Contributor

@bart0sh bart0sh commented Sep 14, 2018

What this PR does / why we need it:

Added cri-installation page with CRI installation instructions
Referenced it from kubeadm-init and install-kubeadm pages.

Which issue this PR fixes
Fixes: kubernetes/kubeadm#1086, #9692

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 14, 2018
@bart0sh bart0sh mentioned this pull request Sep 14, 2018
Closed
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 5befdc6

https://deploy-preview-10299--kubernetes-io-master-staging.netlify.com

@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 61c1f4a

https://deploy-preview-10299--kubernetes-io-master-staging.netlify.com

@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch from 5befdc6 to d56ed16 Compare September 14, 2018 13:39
neolit123
neolit123 reviewed Sep 14, 2018
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

@bart0sh @vincepri thanks.

did only a quick review, but one problem is that this should be against the release-1.12 branch of website and not master because this is adding docs related to 1.12 :.

@vincepri please close the original PR if it's cherry picked in this PR now.

content/en/docs/setup/cri/cri-installation.md Outdated
stable"

# Install docker.
apt-get update && apt-get install docker-ce=17.03.2~ce-0~ubuntu-xenial
Copy link
Member

Choose a reason for hiding this comment

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

we are merging a PR to validate 18.06 by default:
kubernetes/kubernetes#68495
[1]

content/en/docs/setup/cri/cri-installation.md Outdated
https://download.docker.com/linux/centos/docker-ce.repo

# Install docker.
apt-get update && yum install docker-ce-17.03.2.ce
Copy link
Member

Choose a reason for hiding this comment

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

[1]

@neolit123
Copy link
Member

/assign @Bradamant3 @timothysc
/cc @kubernetes/sig-cluster-lifecycle-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. label Sep 14, 2018
@vincepri
Copy link
Member

@bart0sh @neolit123 the original PR is now closed. This looks good now.

@bart0sh bart0sh changed the title Add CRI installation instructions page WIP: Add CRI installation instructions page Sep 15, 2018
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2018
@bart0sh
Copy link
Contributor Author

bart0sh commented Sep 15, 2018

@neolit123

this should be against the release-1.12 branch

Thanks for pointing this out. Will rebase this or create new PR.

Note, this is work in progress. Things I'm considering to do:

@Bradamant3
Copy link
Contributor

@bart0sh Docs PRs must be merged by 9/18. Please rebase and finish up any WIP items by then. Thanks!

Bradamant3
Bradamant3 reviewed Sep 15, 2018
View reviewed changes
content/en/docs/setup/cri/_index.md Outdated
---
title: Kubernetes CRI
weight: 30
---
Copy link
Contributor

Choose a reason for hiding this comment

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

Are more topics planned for CRI? If not, we should have a single "CRI Installation" topic instead of nesting only one topic.

Bradamant3
Bradamant3 reviewed Sep 15, 2018
View reviewed changes
content/en/docs/setup/cri/cri-installation.md Outdated

{{< tabs name="tab-cri-docker-installation" >}}
{{< tab name="Ubuntu 16.04" codelang="bash" >}}
# Install prerequisites.
Copy link
Contributor

Choose a reason for hiding this comment

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

(fixed up this line to display properly)

@Bradamant3 Bradamant3 added this to the 1.12 milestone Sep 15, 2018
@bart0sh bart0sh changed the base branch from master to release-1.12 September 17, 2018 09:53
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 17, 2018
@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch from 61c1f4a to 67853ae Compare September 17, 2018 09:53
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-vnext-staging processing.

Built with commit 67853ae

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5b9f799b67610c3596a4fe62

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 17, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-vnext-staging processing.

Built with commit eea1385

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5ba21771b13fb15bba25ca20

@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch from 67853ae to 04713e7 Compare September 17, 2018 11:05
@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch 3 times, most recently from fa84aaa to f55a6d7 Compare September 18, 2018 13:04
mythi
mythi reviewed Sep 18, 2018
View reviewed changes
content/en/docs/setup/cri.md Outdated
{{< /tab >}}
{{< tab name="CentOS/RHEL 7.4+" codelang="bash" >}}

#### Prerequisites
Copy link
Contributor

Choose a reason for hiding this comment

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

The same sysctl set needed by containerd is needed by CRI-O.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks. Should be fixed now.

@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch 2 times, most recently from d0f07cd to b1e1d2e Compare September 18, 2018 13:25
@bart0sh
Copy link
Contributor Author

bart0sh commented Sep 18, 2018

@timothysc @Bradamant3

Docs PRs must be merged by 9/18. Please rebase and finish up any WIP items by then. Thanks!

I think I'm done with this. Please review and approve.

@neolit123
Copy link
Member

thanks @bart0sh
IMO this looks good for 1.12,
if we have errors or if something has to be changed, we can quickly amend shortly after the release.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2018
@bart0sh
Copy link
Contributor Author

bart0sh commented Sep 18, 2018

@neolit123 Thank you! BTW, should I send this to master as well?

@neolit123
Copy link
Member

@bart0sh

Thank you! BTW, should I send this to master as well?

no, there is no need.

timothysc
timothysc approved these changes Sep 18, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch from b1e1d2e to 71c0cfb Compare September 19, 2018 09:17
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch 2 times, most recently from 00f0e47 to 4da32a8 Compare September 19, 2018 09:27
@bart0sh
Add CRI installation instructions page
eea1385 
Added cri-installation page with CRI installation instructions
Referenced it from kubeadm-init and install-kubeadm pages.
@bart0sh bart0sh force-pushed the PR0028-kubeadm-CRI-documentation branch from 4da32a8 to eea1385 Compare September 19, 2018 09:31
@bart0sh
Copy link
Contributor Author

bart0sh commented Sep 19, 2018 •
edited

As this PR is not merged yet I did a bit of markup changes to make the page looking a bit better.
Now it's ready to be merged.

@neolit123
Copy link
Member

@bart0sh
thanks, had a look at the page myself again.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2018
@timothysc
Copy link
Member

@kubernetes/sig-docs-pr-reviews - We are good to go, merge request, please.

@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Sep 19, 2018
@ryanmcginnis
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ryanmcginnis, timothysc

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 19, 2018
@ryanmcginnis ryanmcginnis merged commit b3529ee into kubernetes:release-1.12 Sep 19, 2018
@warmchang warmchang mentioned this pull request Oct 30, 2018
Closed
@vincepri vincepri mentioned this pull request Dec 4, 2018
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@mythi mythi mythi left review comments

@Bradamant3 Bradamant3 Bradamant3 left review comments

@timothysc timothysc timothysc approved these changes

@jbeda jbeda Awaiting requested review from jbeda

@zhangxiaoyu-zidif zhangxiaoyu-zidif Awaiting requested review from zhangxiaoyu-zidif

Assignees

@timothysc timothysc

@neolit123 neolit123

@Bradamant3 Bradamant3

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.12
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@bart0sh @k8sio-netlify-preview-bot @neolit123 @vincepri @Bradamant3 @timothysc @ryanmcginnis @k8s-ci-robot @mythi