From cc8ae10735eb0cc1a1693d839e11cd419fd8953f Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Thu, 23 Apr 2015 13:12:39 -0700 Subject: [PATCH] flannel: support for aws-vpc backend and bump to 0.4.0 aws-vpc backend expects AWS credentials to be passed via env vars. Propogate them into the container via --env. --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 3 +++ .../flannel/{flannel-0.3.1-r1.ebuild => flannel-0.4.0.ebuild} | 0 2 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.3.1-r1.ebuild => flannel-0.4.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service index e5fa56e2e6..b8eb21257e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service @@ -24,7 +24,10 @@ 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=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ + --env=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env-file=/run/flannel/options.env \ + --volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \ --volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \ quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.4.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.4.0.ebuild