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
43a985df
Commit
43a985df
authored
Oct 05, 2015
by
Alex Robinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14492 from fgrzadkowski/upgrade_flannel
Upgrade flannel to 0.5.3
parents
84f8f01d
595381d4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
master.md
docs/getting-started-guides/docker-multinode/master.md
+1
-1
master.sh
docs/getting-started-guides/docker-multinode/master.sh
+1
-1
worker.md
docs/getting-started-guides/docker-multinode/worker.md
+1
-1
worker.sh
docs/getting-started-guides/docker-multinode/worker.sh
+1
-1
No files found.
docs/getting-started-guides/docker-multinode/master.md
View file @
43a985df
...
@@ -107,7 +107,7 @@ or it may be something else.
...
@@ -107,7 +107,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.
0
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
```
```
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 @
43a985df
...
@@ -97,7 +97,7 @@ start_k8s(){
...
@@ -97,7 +97,7 @@ start_k8s(){
docker
-H
unix:///var/run/docker-bootstrap.sock run
--net
=
host gcr.io/google_containers/etcd:2.0.12 etcdctl
set
/coreos.com/network/config
'{ "Network": "10.1.0.0/16", "Backend": {"Type": "vxlan"}}'
docker
-H
unix:///var/run/docker-bootstrap.sock run
--net
=
host gcr.io/google_containers/etcd:2.0.12 etcdctl
set
/coreos.com/network/config
'{ "Network": "10.1.0.0/16", "Backend": {"Type": "vxlan"}}'
# iface may change to a private network interface, eth0 is for default
# iface may change to a private network interface, eth0 is for default
flannelCID
=
$(
docker
-H
unix:///var/run/docker-bootstrap.sock run
--restart
=
always
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
0
/opt/bin/flanneld
-iface
=
"eth0"
)
flannelCID
=
$(
docker
-H
unix:///var/run/docker-bootstrap.sock run
--restart
=
always
-d
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
3
/opt/bin/flanneld
-iface
=
"eth0"
)
sleep
8
sleep
8
...
...
docs/getting-started-guides/docker-multinode/worker.md
View file @
43a985df
...
@@ -90,7 +90,7 @@ or it may be something else.
...
@@ -90,7 +90,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.
0
/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.
3
/opt/bin/flanneld
--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 @
43a985df
...
@@ -99,7 +99,7 @@ DOCKER_CONF=""
...
@@ -99,7 +99,7 @@ DOCKER_CONF=""
# Start k8s components in containers
# Start k8s components in containers
start_k8s
()
{
start_k8s
()
{
# Start flannel
# Start flannel
flannelCID
=
$(
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--restart
=
always
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
0
/opt/bin/flanneld
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
-iface
=
"eth0"
)
flannelCID
=
$(
sudo
docker
-H
unix:///var/run/docker-bootstrap.sock run
-d
--restart
=
always
--net
=
host
--privileged
-v
/dev/net:/dev/net quay.io/coreos/flannel:0.5.
3
/opt/bin/flanneld
--etcd-endpoints
=
http://
${
MASTER_IP
}
:4001
-iface
=
"eth0"
)
sleep
8
sleep
8
...
...
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