From 30fd81db4904d4f47ecc9df1ec4c063f67ca0e21 Mon Sep 17 00:00:00 2001 From: Fabrizio Pandini Date: Wed, 5 Jul 2017 20:44:43 +0200 Subject: [PATCH] remove duplicate paragraph in "kubeadm Setup Tool Reference Guide" (#4260) * remove duplicate paragraph * remove duplicate paragraph --- docs/admin/kubeadm.md | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md index e9d7f7cea5..44a4f8bf5b 100644 --- a/docs/admin/kubeadm.md +++ b/docs/admin/kubeadm.md @@ -485,23 +485,6 @@ EOF Now `kubelet` is ready to use the specified CRI runtime, and you can continue with `kubeadm init` and `kubeadm join` workflow to deploy Kubernetes cluster. -## Using custom certificates - -By default kubeadm will generate all the certificates needed for a cluster to run. -You can override this behaviour by providing your own certificates. - -To do so, you must place them in whatever directory is specified by the -`--cert-dir` flag or `CertificatesDir` configuration file key. By default this -is `/etc/kubernetes/pki`. - -If a given certificate and private key pair both exist, kubeadm will skip the -generation step and those files will be validated and used for the prescribed -use-case. - -This means you can, for example, prepopulate `/etc/kubernetes/pki/ca.crt` -and `/etc/kubernetes/pki/ca.key` with an existing CA, which then will be used -for signing the rest of the certs. - ## Running kubeadm without an internet connection All of the control plane components run in Pods started by the kubelet and @@ -673,31 +656,6 @@ export no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com,example.com,1 Remember to change `proxy_ip` and add a kube master node IP address to `no_proxy`. -## Use Kubeadm with other CRI runtimes - -Since [Kubernetes 1.6 release](https://git.k8s.io/kubernetes/CHANGELOG.md#node-components-1), Kubernetes container runtimes have been transferred to using CRI by default. Currently, the build-in container runtime is Docker which is enabled by build-in `dockershim` in `kubelet`. - -Using other CRI based runtimes with kubeadm is very simple, and currently supported runtimes are: - -- [cri-o](https://github.com/kubernetes-incubator/cri-o) -- [frakti](https://github.com/kubernetes/frakti) -- [rkt](https://github.com/kubernetes-incubator/rktlet) - -After you have successfully installed `kubeadm` and `kubelet`, please follow these two steps: - -1. Install runtime shim on every node. You will need to follow the installation document in the runtime shim project listing above. - -2. Configure kubelet to use remote CRI runtime. Please remember to change `RUNTIME_ENDPOINT` to your own value like `/var/run/{your_runtime}.sock`: - -```shell - $ cat > /etc/systemd/system/kubelet.service.d/20-cri.conf <