whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix docker installation links (#14154)

Browse Source 
The docker installation instructions have been moved to cri-installation
page.

This patch fixes the stale links and a typo.
This commit is contained in:
Quan Tian
2019-05-05 09:09:37 +08:00
committed by Kubernetes Prow Robot
parent 9d0e8d0e83
commit 9763024129
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/setup/independent/troubleshooting-kubeadm.md
+3 -3
View File
@@ -58,7 +58,7 @@ This may be caused by a number of problems. The most common are:
There are two common ways to fix the cgroup driver problem: There are two common ways to fix the cgroup driver problem:
1. Install Docker again following instructions 1. Install Docker again following instructions
[here](/docs/setup/independent/install-kubeadm/#installing-docker). [here](/docs/setup/cri/#docker).
1. Change the kubelet config to match the Docker cgroup driver manually, you can refer to 1. Change the kubelet config to match the Docker cgroup driver manually, you can refer to
[Configure cgroup driver used by kubelet on Master Node](/docs/setup/independent/install-kubeadm/#configure-cgroup-driver-used-by-kubelet-on-master-node) [Configure cgroup driver used by kubelet on Master Node](/docs/setup/independent/install-kubeadm/#configure-cgroup-driver-used-by-kubelet-on-master-node)
for detailed instructions. for detailed instructions.
@@ -219,7 +219,7 @@ Error from server: Get https://10.19.0.41:10250/containerLogs/default/mysql-ddc6
If you have nodes that are running SELinux with an older version of Docker you might experience a scenario If you have nodes that are running SELinux with an older version of Docker you might experience a scenario
where the `coredns` pods are not starting. To solve that you can try one of the following options: where the `coredns` pods are not starting. To solve that you can try one of the following options:
- Upgrade to a [newer version of Docker](/docs/setup/independent/install-kubeadm/#installing-docker). - Upgrade to a [newer version of Docker](/docs/setup/cri/#docker).
- [Disable SELinux](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/security-enhanced_linux/sect-security-enhanced_linux-enabling_and_disabling_selinux-disabling_selinux). - [Disable SELinux](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/security-enhanced_linux/sect-security-enhanced_linux-enabling_and_disabling_selinux-disabling_selinux).
- Modify the `coredns` deployment to set `allowPrivilegeEscalation` to `true`: - Modify the `coredns` deployment to set `allowPrivilegeEscalation` to `true`:
@@ -273,7 +273,7 @@ If you decide to pass an argument that supports multiple, comma-separated values
`--apiserver-extra-args` expects `key=value` pairs and in this case `NamespacesExists` is considered `--apiserver-extra-args` expects `key=value` pairs and in this case `NamespacesExists` is considered
as a key that is missing a value. as a key that is missing a value.
Alternativelly, you can try separating the `key=value` pairs like so: Alternatively, you can try separating the `key=value` pairs like so:
`--apiserver-extra-args "enable-admission-plugins=LimitRanger,enable-admission-plugins=NamespaceExists"` `--apiserver-extra-args "enable-admission-plugins=LimitRanger,enable-admission-plugins=NamespaceExists"`
but this will result in the key `enable-admission-plugins` only having the value of `NamespaceExists`. but this will result in the key `enable-admission-plugins` only having the value of `NamespaceExists`.
content/en/docs/user-journeys/users/application-developer/foundational.md
+1 -1
View File
@@ -43,7 +43,7 @@ Minikube can be installed locally, and runs a simple, single-node Kubernetes clu
* {{< link text="Install kubectl" url="/docs/tasks/tools/install-kubectl/" >}}. ({{< glossary_tooltip text="What is kubectl?" term_id="kubectl" >}}) * {{< link text="Install kubectl" url="/docs/tasks/tools/install-kubectl/" >}}. ({{< glossary_tooltip text="What is kubectl?" term_id="kubectl" >}})
* *(Optional)* {{< link text="Install Docker" url="/docs/setup/independent/install-kubeadm/#installing-docker" >}} if you plan to run your Minikube cluster as part of a local development environment. * *(Optional)* {{< link text="Install Docker" url="/docs/setup/cri/#docker" >}} if you plan to run your Minikube cluster as part of a local development environment.
Minikube includes a Docker daemon, but if you're developing applications locally, you'll want an independent Docker instance to support your workflow. This allows you to create {{< glossary_tooltip text="containers" term_id="container" >}} and push them to a container registry. Minikube includes a Docker daemon, but if you're developing applications locally, you'll want an independent Docker instance to support your workflow. This allows you to create {{< glossary_tooltip text="containers" term_id="container" >}} and push them to a container registry.