github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20795 from luxas/remove_dev

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-15 03:52:26 -08:00
commit 138cb09aea
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/get-kube-local.sh
View File

@ -59,7 +59,6 @@ function create_cluster {
run "docker run \ run "docker run \
--volume=/:/rootfs:ro \ --volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
--volume=/dev:/dev \
--volume=/var/lib/docker/:/var/lib/docker:rw \ --volume=/var/lib/docker/:/var/lib/docker:rw \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \

7
cluster/images/hyperkube/turnup.sh
View File

@ -20,19 +20,18 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
K8S_VERSION=${K8S_VERSION:-"1.1.3"} K8S_VERSION=${K8S_VERSION:-"1.2.0-alpha.7"}
docker run \ docker run \
--volume=/:/rootfs:ro \ --volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
--volume=/dev:/dev \
--volume=/var/lib/docker/:/var/lib/docker:rw \ --volume=/var/lib/docker/:/var/lib/docker:rw \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \
--net=host \ --net=host \
--pid=host \ --pid=host \
--privileged=true \ --privileged=true \
-d gcr.io/google_containers/hyperkube:v${K8S_VERSION} \ -d gcr.io/google_containers/hyperkube-amd64:v${K8S_VERSION} \
/hyperkube kubelet \ /hyperkube kubelet \
--containerized \ --containerized \
--hostname-override="127.0.0.1" \ --hostname-override="127.0.0.1" \
@ -41,4 +40,4 @@ docker run \
--config=/etc/kubernetes/manifests \ --config=/etc/kubernetes/manifests \
--cluster-dns=10.0.0.10 \ --cluster-dns=10.0.0.10 \
--cluster-domain=cluster.local \ --cluster-domain=cluster.local \
--allow-privileged=true --v=10 --allow-privileged=true --v=2

1
docs/getting-started-guides/docker-multinode/master.md
View File

@ -197,7 +197,6 @@ Ok, now that your networking is set up, you can startup Kubernetes, this is the
sudo docker run \ sudo docker run \
--volume=/:/rootfs:ro \ --volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
--volume=/dev:/dev \
--volume=/var/lib/docker/:/var/lib/docker:rw \ --volume=/var/lib/docker/:/var/lib/docker:rw \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \

1
docs/getting-started-guides/docker-multinode/master.sh
View File

@ -207,7 +207,6 @@ start_k8s(){
-v /sys:/sys:ro \ -v /sys:/sys:ro \
-v /var/run:/var/run:rw \ -v /var/run:/var/run:rw \
-v /:/rootfs:ro \ -v /:/rootfs:ro \
-v /dev:/dev \
-v /var/lib/docker/:/var/lib/docker:rw \ -v /var/lib/docker/:/var/lib/docker:rw \
-v /var/lib/kubelet/:/var/lib/kubelet:rw \ -v /var/lib/kubelet/:/var/lib/kubelet:rw \
gcr.io/google_containers/hyperkube-${ARCH}:v${K8S_VERSION} \ gcr.io/google_containers/hyperkube-${ARCH}:v${K8S_VERSION} \

1
docs/getting-started-guides/docker-multinode/worker.sh
View File

@ -187,7 +187,6 @@ start_k8s() {
-v /sys:/sys:ro \ -v /sys:/sys:ro \
-v /var/run:/var/run:rw \ -v /var/run:/var/run:rw \
-v /:/rootfs:ro \ -v /:/rootfs:ro \
-v /dev:/dev \
-v /var/lib/docker/:/var/lib/docker:rw \ -v /var/lib/docker/:/var/lib/docker:rw \
-v /var/lib/kubelet/:/var/lib/kubelet:rw \ -v /var/lib/kubelet/:/var/lib/kubelet:rw \
gcr.io/google_containers/hyperkube-${ARCH}:v${K8S_VERSION} \ gcr.io/google_containers/hyperkube-${ARCH}:v${K8S_VERSION} \

5
docs/getting-started-guides/docker.md
View File

@ -66,7 +66,6 @@ Here's a diagram of what the final result will look like:
docker run \ docker run \
--volume=/:/rootfs:ro \ --volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \ --volume=/sys:/sys:ro \
--volume=/dev:/dev \
--volume=/var/lib/docker/:/var/lib/docker:rw \ --volume=/var/lib/docker/:/var/lib/docker:rw \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \
@ -83,11 +82,13 @@ docker run \
--config=/etc/kubernetes/manifests \ --config=/etc/kubernetes/manifests \
--cluster-dns=10.0.0.10 \ --cluster-dns=10.0.0.10 \
--cluster-domain=cluster.local \ --cluster-domain=cluster.local \
--allow-privileged=true --v=10 --allow-privileged=true --v=2
``` ```
> Note that `--cluster-dns` and `--cluster-domain` is used to deploy dns, feel free to discard them if dns is not needed. > Note that `--cluster-dns` and `--cluster-domain` is used to deploy dns, feel free to discard them if dns is not needed.
> If you would like to mount an external device as a volume, add `--volume=/dev:/dev` to the command above. It may however, cause some problems described in [#18230](https://github.com/kubernetes/kubernetes/issues/18230)
This actually runs the kubelet, which in turn runs a [pod](../user-guide/pods.md) that contains the other master components. This actually runs the kubelet, which in turn runs a [pod](../user-guide/pods.md) that contains the other master components.
### Download `kubectl` ### Download `kubectl`