Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
8ba250e1
Commit
8ba250e1
authored
Dec 07, 2015
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump flannel to 0.5.5 in instructions
parent
ec1ba743
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
master.md
docs/getting-started-guides/docker-multinode/master.md
+1
-1
master.sh
docs/getting-started-guides/docker-multinode/master.sh
+2
-1
worker.md
docs/getting-started-guides/docker-multinode/worker.md
+1
-1
worker.sh
docs/getting-started-guides/docker-multinode/worker.sh
+2
-1
ubuntu.md
docs/getting-started-guides/ubuntu.md
+2
-2
No files found.
docs/getting-started-guides/docker-multinode/master.md
View file @
8ba250e1
...
@@ -115,7 +115,7 @@ or it may be something else.
...
@@ -115,7 +115,7 @@ or it may be something else.
Now run flanneld itself:
Now run flanneld itself:
```
sh
```
sh
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
3
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
5
--ip-masq
```
```
The previous command should have printed a really long hash, copy this hash.
The previous command should have printed a really long hash, copy this hash.
...
...
docs/getting-started-guides/docker-multinode/master.sh
View file @
8ba250e1
...
@@ -139,8 +139,9 @@ start_k8s(){
...
@@ -139,8 +139,9 @@ start_k8s(){
--net
=
host
\
--net
=
host
\
--privileged
\
--privileged
\
-v
/dev/net:/dev/net
\
-v
/dev/net:/dev/net
\
quay.io/coreos/flannel:0.5.
3
\
quay.io/coreos/flannel:0.5.
5
\
/opt/bin/flanneld
\
/opt/bin/flanneld
\
--ip-masq
\
-iface
=
"eth0"
)
-iface
=
"eth0"
)
sleep
8
sleep
8
...
...
docs/getting-started-guides/docker-multinode/worker.md
View file @
8ba250e1
...
@@ -91,7 +91,7 @@ or it may be something else.
...
@@ -91,7 +91,7 @@ or it may be something else.
Now run flanneld itself, this call is slightly different from the above, since we point it at the etcd instance on the master.
Now run flanneld itself, this call is slightly different from the above, since we point it at the etcd instance on the master.
```
sh
```
sh
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
3 /opt/bin/flanneld
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
5 /opt/bin/flanneld
--ip-masq
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
```
```
The previous command should have printed a really long hash, copy this hash.
The previous command should have printed a really long hash, copy this hash.
...
...
docs/getting-started-guides/docker-multinode/worker.sh
View file @
8ba250e1
...
@@ -125,8 +125,9 @@ start_k8s() {
...
@@ -125,8 +125,9 @@ start_k8s() {
--net
=
host
\
--net
=
host
\
--privileged
\
--privileged
\
-v
/dev/net:/dev/net
\
-v
/dev/net:/dev/net
\
quay.io/coreos/flannel:0.5.
3
\
quay.io/coreos/flannel:0.5.
5
\
/opt/bin/flanneld
\
/opt/bin/flanneld
\
--ip-masq
\
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
-iface
=
"eth0"
)
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
-iface
=
"eth0"
)
sleep
8
sleep
8
...
...
docs/getting-started-guides/ubuntu.md
View file @
8ba250e1
...
@@ -60,7 +60,7 @@ work, which has been merge into this document.
...
@@ -60,7 +60,7 @@ work, which has been merge into this document.
Internet to download the necessary files, while worker nodes do not.
Internet to download the necessary files, while worker nodes do not.
3.
These guide is tested OK on Ubuntu 14.04 LTS 64bit server, but it can not work with
3.
These guide is tested OK on Ubuntu 14.04 LTS 64bit server, but it can not work with
Ubuntu 15 which uses systemd instead of upstart.
Ubuntu 15 which uses systemd instead of upstart.
4.
Dependencies of this guide: etcd-2.2.1, flannel-0.5.
3
, k8s-1.1.2, may work with higher versions.
4.
Dependencies of this guide: etcd-2.2.1, flannel-0.5.
5
, k8s-1.1.2, may work with higher versions.
5.
All the remote servers can be ssh logged in without a password by using key authentication.
5.
All the remote servers can be ssh logged in without a password by using key authentication.
...
@@ -77,7 +77,7 @@ $ git clone https://github.com/kubernetes/kubernetes.git
...
@@ -77,7 +77,7 @@ $ git clone https://github.com/kubernetes/kubernetes.git
#### Configure and start the Kubernetes cluster
#### Configure and start the Kubernetes cluster
The startup process will first download all the required binaries automatically.
The startup process will first download all the required binaries automatically.
By default etcd version is 2.2.1, flannel version is 0.5.
3
and k8s version is 1.1.2.
By default etcd version is 2.2.1, flannel version is 0.5.
5
and k8s version is 1.1.2.
You can customize your etcd version, flannel version, k8s version by changing corresponding variables
You can customize your etcd version, flannel version, k8s version by changing corresponding variables
`ETCD_VERSION`
,
`FLANNEL_VERSION`
and
`KUBE_VERSION`
like following.
`ETCD_VERSION`
,
`FLANNEL_VERSION`
and
`KUBE_VERSION`
like following.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment