Skip to content

K
k3s
Commit 3e3a4f49 authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Merge pull request #6049 from AntonioMeireles/master

simplify and turn more idiomatic flanneld's setup in CoreOS' cloud-configs
parents 308049e7 7bc7f47c
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 43 deletions
docs/getting-started-guides/aws/cloud-configs/master.yaml
View file @ 3e3a4f49
...@@ -11,6 +11,8 @@ coreos: ...@@ -11,6 +11,8 @@ coreos:
fleet: fleet:
etcd-servers: http://localhost:4001 etcd-servers: http://localhost:4001
metadata: "role=master" metadata: "role=master"
flannel:
interface: eth1
units: units:
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
...@@ -72,16 +74,10 @@ coreos: ...@@ -72,16 +74,10 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true --iface=eth1
- name: docker-cache.service - name: docker-cache.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/aws/cloud-configs/node.yaml
View file @ 3e3a4f49
...@@ -4,6 +4,8 @@ coreos: ...@@ -4,6 +4,8 @@ coreos:
fleet: fleet:
etcd-servers: http://<master-private-ip>:4001 etcd-servers: http://<master-private-ip>:4001
metadata: "role=node" metadata: "role=node"
flannel:
interface: eth1
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
...@@ -14,19 +16,10 @@ coreos: ...@@ -14,19 +16,10 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
# as we need to turn eth1 as the default interface
# https://github.com/coreos/bugs/issues/228 is sorted
# see notes in https://github.com/coreos/flannel/pull/137
ExecStart=
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001 --ip-masq=true --iface=eth1
- name: docker.service - name: docker.service
command: start command: start
drop-ins: drop-ins:
......
docs/getting-started-guides/coreos/cloud-configs/master.yaml
View file @ 3e3a4f49
...@@ -11,6 +11,8 @@ coreos: ...@@ -11,6 +11,8 @@ coreos:
fleet: fleet:
etcd-servers: http://localhost:4001 etcd-servers: http://localhost:4001
metadata: "role=master" metadata: "role=master"
flannel:
interface: eth1
units: units:
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start
...@@ -74,16 +76,10 @@ coreos: ...@@ -74,16 +76,10 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true --iface=eth1
- name: docker-cache.service - name: docker-cache.service
command: start command: start
content: | content: |
......
docs/getting-started-guides/coreos/cloud-configs/node.yaml
View file @ 3e3a4f49
...@@ -4,6 +4,8 @@ coreos: ...@@ -4,6 +4,8 @@ coreos:
fleet: fleet:
etcd-servers: http://<master-private-ip>:4001 etcd-servers: http://<master-private-ip>:4001
metadata: "role=node" metadata: "role=node"
flannel:
interface: eth1
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
...@@ -14,16 +16,10 @@ coreos: ...@@ -14,16 +16,10 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld -etcd-endpoints http://<master-private-ip>:4001 --ip-masq=true --iface=eth1
- name: docker.service - name: docker.service
command: start command: start
drop-ins: drop-ins:
......
docs/getting-started-guides/coreos/cloud-configs/standalone.yaml
View file @ 3e3a4f49
...@@ -9,6 +9,8 @@ write_files: ...@@ -9,6 +9,8 @@ write_files:
until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
hostname: standalone hostname: standalone
coreos: coreos:
flannel:
interface: eth1
units: units:
- name: etcd.service - name: etcd.service
command: start command: start
...@@ -35,16 +37,10 @@ coreos: ...@@ -35,16 +37,10 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true --iface=eth1
- name: docker-cache.service - name: docker-cache.service
command: start command: start
content: | content: |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment