Skip to content

Commit

Permalink
Close #13087 (#13351)
Browse files Browse the repository at this point in the history
  • Loading branch information
cstoku authored and k8s-ci-robot committed Mar 26, 2019
1 parent 26047cc commit 2e2bfd5
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions content/ja/docs/setup/independent/install-kubeadm.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
title: kubeadmのインストール
content_template: templates/task
weight: 20
card:
name: setup
weight: 20
title: kubeadmセットアップツールのインストール
---

{{% capture overview %}}
Expand Down Expand Up @@ -90,7 +94,6 @@ Other CRI-based runtimes include:
- [containerd](https://github.com/containerd/cri) (CRI plugin built into containerd)
- [cri-o](https://github.com/kubernetes-incubator/cri-o)
- [frakti](https://github.com/kubernetes/frakti)
- [rkt](https://github.com/kubernetes-incubator/rktlet)

Refer to the [CRI installation instructions](/docs/setup/cri) for more information.

Expand All @@ -106,7 +109,7 @@ You will install these packages on all of your machines:
* `kubectl`: the command line util to talk to your cluster.

kubeadm **will not** install or manage `kubelet` or `kubectl` for you, so you will
need to ensure they match the version of the Kubernetes control panel you want
need to ensure they match the version of the Kubernetes control plane you want
kubeadm to install for you. If you do not, there is a risk of a version skew occurring that
can lead to unexpected, buggy behaviour. However, _one_ minor version skew between the
kubelet and the control plane is supported, but the kubelet version may never exceed the API
Expand All @@ -119,8 +122,10 @@ This is because kubeadm and Kubernetes require
[special attention to upgrade](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11/).
{{</ warning >}}

For more information on version skews, please read our
[version skew policy](/docs/setup/independent/create-cluster-kubeadm/#version-skew-policy).
For more information on version skews, see:

* Kubernetes [version and version-skew policy](/docs/setup/version-skew-policy/)
* Kubeadm-specific [version skew policy](/docs/setup/independent/create-cluster-kubeadm/#version-skew-policy)

{{< tabs name="k8s_install" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}}
Expand Down Expand Up @@ -154,7 +159,7 @@ sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config

yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes

systemctl enable kubelet && systemctl start kubelet
systemctl enable --now kubelet
```

**Note:**
Expand All @@ -172,6 +177,7 @@ systemctl enable kubelet && systemctl start kubelet
EOF
sysctl --system
```
- Make sure that the `br_netfilter` module is loaded before this step. This can be done by running `lsmod | grep br_netfilter`. To load it explicitly call `modprobe br_netfilter`.
{{% /tab %}}
{{% tab name="Container Linux" %}}
Install CNI plugins (required for most pod network):
Expand Down Expand Up @@ -208,7 +214,7 @@ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/bu
Enable and start `kubelet`:
```bash
systemctl enable kubelet && systemctl start kubelet
systemctl enable --now kubelet
```
{{% /tab %}}
{{< /tabs >}}
Expand Down

0 comments on commit 2e2bfd5

Please sign in to comment.