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

Merge pull request #13446 from fgrzadkowski/fix_docker_multinode_doc

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-02 06:48:56 -07:00
commit dd5f970679
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/images/hyperkube/Dockerfile
View File

@ -1,12 +1,15 @@
FROM google/debian:wheezy FROM debian:jessie
RUN apt-get update RUN apt-get update
RUN apt-get -yy -q install iptables ca-certificates RUN apt-get -yy -q install iptables ca-certificates file util-linux
RUN cp /usr/bin/nsenter /nsenter
COPY hyperkube /hyperkube COPY hyperkube /hyperkube
RUN chmod a+rx /hyperkube RUN chmod a+rx /hyperkube
COPY master-multi.json /etc/kubernetes/manifests-multi/master.json COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
COPY master.json /etc/kubernetes/manifests/master.json COPY master.json /etc/kubernetes/manifests/master.json
COPY safe_format_and_mount /usr/share/google/safe_format_and_mount COPY safe_format_and_mount /usr/share/google/safe_format_and_mount
RUN chmod a+rx /usr/share/google/safe_format_and_mount RUN chmod a+rx /usr/share/google/safe_format_and_mount

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

@ -92,15 +92,24 @@ docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etc
### Step Two: Run the master ### Step Two: Run the master
```sh ```sh
docker run --net=host --privileged -d -v /sys:/sys:ro -v /var/run/docker.sock:/var/run/docker.sock gcr.io/google_containers/hyperkube:v1.0.1 /hyperkube kubelet --api-servers=http://localhost:8080 --v=2 --address=0.0.0.0 --enable-server --hostname-override=127.0.0.1 --config=/etc/kubernetes/manifests docker run \
--volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \
--volume=/dev:/dev \
--volume=/var/lib/docker/:/var/lib/docker:ro \
--volume=/var/lib/kubelet/:/var/lib/kubelet:rw \
--volume=/var/run:/var/run:rw \
--net=host \
--privileged=true \
-d \
gcr.io/google_containers/hyperkube:v1.0.1 \
/hyperkube kubelet --containerized --hostname-override="127.0.0.1" --address="0.0.0.0" --api-servers=http://localhost:8080 --config=/etc/kubernetes/manifests
``` ```
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.
### Step Three: Run the service proxy ### Step Three: Run the service proxy
*Note, this could be combined with master above, but it requires --privileged for iptables manipulation*
```sh ```sh
docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v1.0.1 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2 docker run -d --net=host --privileged gcr.io/google_containers/hyperkube:v1.0.1 /hyperkube proxy --master=http://127.0.0.1:8080 --v=2
``` ```

9
pkg/util/mount/nsenter_mount.go
View File

@ -71,8 +71,8 @@ func NewNsenterMounter() *NsenterMounter {
// default to root // default to root
m.paths[binary] = filepath.Join("/", binary) m.paths[binary] = filepath.Join("/", binary)
for _, path := range []string{"/bin", "/usr/sbin", "/usr/bin"} { for _, path := range []string{"/bin", "/usr/sbin", "/usr/bin"} {
binPath := filepath.Join(hostRootFsPath, path, binary) binPath := filepath.Join(path, binary)
if _, err := os.Stat(binPath); err != nil { if _, err := os.Stat(filepath.Join(hostRootFsPath, binPath)); err != nil {
continue continue
} }
m.paths[binary] = binPath m.paths[binary] = binPath
@ -176,8 +176,9 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
exec := exec.New() exec := exec.New()
out, err := exec.Command(nsenterPath, args...).CombinedOutput() out, err := exec.Command(nsenterPath, args...).CombinedOutput()
if err != nil { if err != nil {
// If findmnt didn't run, just claim it's not a mount point. // If the command itself is correct, then if we encountered error
return true, nil // then most likely this means that the directory does not exist.
return true, os.ErrNotExist
} }
strOut := strings.TrimSuffix(string(out), "\n") strOut := strings.TrimSuffix(string(out), "\n")