-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
Fix CRI-O installation information #23000
Conversation
Welcome @haircommander! |
PTAL @TomSweeneyRedHat |
Deploy preview for kubernetes-io-master-staging ready! Built with commit ed4506c https://deploy-preview-23000--kubernetes-io-master-staging.netlify.app |
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | ||
For instance, if you want to install cri-o 1.17, `VERSION=1.17` | ||
We also support pinning to a particular release. To install 1.17.3, `VERSION=1.17:1.17.3` |
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.
is 1.17 the latest on CENTOS? If 1.18 is, I'd bump this example
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.
fixed
One question, otherwise LGTM |
7104f98
to
a41249b
Compare
content/en/docs/setup/production-environment/container-runtimes.md
Outdated
Show resolved
Hide resolved
content/en/docs/setup/production-environment/container-runtimes.md
Outdated
Show resolved
Hide resolved
| Centos 8 | `CentOS_8` | | ||
| Centos 8 Stream | `CentOS_8_Stream` | | ||
| Centos 7 | `CentOS_7` | | ||
<br /> |
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.
Is the <br>
required to provide spacing between the table and the following text?
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.
yeah!
a41249b
to
c061bde
Compare
addressed as suggested @kbhawkey PTAL |
Is this design intended? looks kinda weird to me 🤔 |
If I'm being honest, the table format is not being rendered super well. I think it is clear enough to be understood, but I'm happy to adopt a change that would look better. |
| Ubuntu 19.10 | `xUbuntu_19.10` | | ||
| Ubuntu 19.04 | `xUbuntu_19.04` | | ||
| Ubuntu 18.04 | `xUbuntu_18.04` | | ||
<br /> |
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.
Hi @haircommander .
I suspect the parser is not happy with the <br>
elements.
What happens if these are removed? Is there no spacing after the table
and before the next line of text?
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.
yeah the table comes immediately before. It definitely looks weird. I can push an updated version if you'd like
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.
lmk what you think, I left it as a separate commit to be easily reverted. I think the oddly spaced out table is better
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.
actually, I updated the version, adding a newline between br and the table. that fixed the issue
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.
Thanks @haircommander. The tables look good.
78d1e97
to
36eefba
Compare
/lgtm |
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.
@haircommander 👋 Thanks for the update! Please follow the style guide, specifically:
- Capitalize consistently
- Avoid "we"
- Use in-line code formatting
{{% /tab %}} | ||
{{% tab name="Fedora" %}} | ||
|
||
Set `$VERSION` to be the cri-o version matching your kubernetes version. |
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.
Set `$VERSION` to be the cri-o version matching your kubernetes version. | |
Set `$VERSION` to the CRI-O version that matches your Kubernetes version. |
{{% tab name="Fedora" %}} | ||
|
||
Set `$VERSION` to be the cri-o version matching your kubernetes version. | ||
For instance, if you want to install cri-o 1.18, `VERSION=1.18` |
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.
Capitalize consistently.
For instance, if you want to install cri-o 1.18, `VERSION=1.18` | |
For instance, if you want to install CRI-O 1.18, `VERSION=1.18` |
```shell | ||
dnf module list cri-o | ||
``` | ||
We do not support pinning to specific releases on Fedora. |
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.
Avoid using "we".
We do not support pinning to specific releases on Fedora. | |
CRI-O does not support pinning to specific releases on Fedora. |
echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list | ||
wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_Unstable/Release.key -O- | sudo apt-key add - | ||
``` | ||
To install CRI-O on the following operating systems, set the environment variable $OS as the appropriate field in the following table: |
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.
Use code format for inline code.
To install CRI-O on the following operating systems, set the environment variable $OS as the appropriate field in the following table: | |
To install CRI-O on the following operating systems, set the environment variable $OS to the appropriate field in the following table: |
wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_10/Release.key -O- | sudo apt-key add - | ||
``` | ||
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. |
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.
Capitalize consistently.
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | |
Then, set `$VERSION` to be the CRI-O version matching your kubernetes version. |
| Ubuntu 18.04 | `xUbuntu_18.04` | | ||
|
||
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. |
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.
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | |
Then, set `$VERSION` to the CRI-O version that matches your Kubernetes version. |
|
||
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | ||
For instance, if you want to install cri-o 1.18, set `VERSION=1.18`. |
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.
Capitalize consistently.
For instance, if you want to install cri-o 1.18, set `VERSION=1.18`. | |
For instance, if you want to install CRI-O 1.18, set `VERSION=1.18`. |
curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/CentOS_7/devel:kubic:libcontainers:stable.repo | ||
curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable:cri-o:{{< skew latestVersion >}}.repo https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:{{< skew latestVersion >}}/CentOS_7/devel:kubic:libcontainers:stable:cri-o:{{< skew latestVersion >}}.repo | ||
``` | ||
To install on the following operating systems, set the environment variable $OS as the appropriate field in the following table: |
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.
To install on the following operating systems, set the environment variable $OS as the appropriate field in the following table: | |
To install CRI- O on the following operating systems, set the environment variable $OS as the appropriate field in the following table: |
| Centos 7 | `CentOS_7` | | ||
|
||
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. |
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.
Capitalize consistently.
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | |
Then, set `$VERSION` to the CRI-O version that matches your Kubernetes version. |
|
||
<br /> | ||
Then, set `$VERSION` to be the cri-o version matching your kubernetes version. | ||
For instance, if you want to install cri-o 1.18, set `VERSION=1.18`. |
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.
For instance, if you want to install cri-o 1.18, set `VERSION=1.18`. | |
For instance, if you want to install CRI-O 1.18, set `VERSION=1.18`. |
update Ubuntu, CentOS and Debian installation instructions add Fedora instructions Signed-off-by: Peter Hunt <pehunt@redhat.com>
36eefba
to
ed4506c
Compare
thank you @zacharysarah, updated as suggested |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: zacharysarah 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 |
update Ubuntu, CentOS and Debian installation instructions
add Fedora instructions