mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 06:21:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

flannel: support for aws-vpc backend and bump to 0.4.0

Browse Source 
aws-vpc backend expects AWS credentials to be passed via
env vars. Propogate them into the container via --env.
This commit is contained in:
Eugene Yakubovich 2015-04-23 13:12:39 -07:00
parent 4a25ea0f41
commit cc8ae10735
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service vendored
View File

@ -24,7 +24,10 @@ ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \ /usr/bin/docker run --net=host --privileged=true --rm \
--volume=/run/flannel:/run/flannel \ --volume=/run/flannel:/run/flannel \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \ --env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env-file=/run/flannel/options.env \ --env-file=/run/flannel/options.env \
--volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \ --volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.4.0.ebuild vendored
View File