From c8f05234558dcd7b28da39411d83eb4c46702dc9 Mon Sep 17 00:00:00 2001
From: Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
Date: Thu, 16 Jun 2016 14:03:27 -0700
Subject: [PATCH] flannel: use rkt to launch flannel on amd64

---
 .../flannel/files/flanneld-rkt.service        | 38 +++++++++++++++++++
 .../app-admin/flannel/flannel-0.5.5-r2.ebuild | 32 +++++++++++++++-
 .../app-admin/flannel/flannel-0.5.5-r3.ebuild |  1 +
 .../app-admin/flannel/flannel-9999.ebuild     |  8 ++--
 4 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service
 mode change 120000 => 100644 sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild
 create mode 120000 sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r3.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service
new file mode 100644
index 0000000000..628fcf0a6e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service
@@ -0,0 +1,38 @@
+[Unit]
+Description=Network fabric for containers
+Documentation=https://github.com/coreos/flannel
+After=etcd.service etcd2.service
+
+[Service]
+Type=notify
+Restart=always
+RestartSec=5
+Environment="TMPDIR=/var/tmp/"
+Environment="FLANNEL_VER={{flannel_ver}}"
+Environment="FLANNEL_IMG=quay.io/coreos/flannel"
+Environment="ETCD_SSL_DIR=/etc/ssl/etcd"
+EnvironmentFile=-/run/flannel/options.env
+LimitNOFILE=40000
+LimitNPROC=1048576
+ExecStartPre=/sbin/modprobe ip_tables
+ExecStartPre=/usr/bin/mkdir -p /run/flannel
+ExecStartPre=/usr/bin/mkdir -p ${ETCD_SSL_DIR}
+
+ExecStart=/usr/bin/rkt run --net=host \
+   --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \
+   --insecure-options=image \
+   --set-env=NOTIFY_SOCKET=/run/systemd/notify \
+   --inherit-env=true \
+   --volume runsystemd,kind=host,source=/run/systemd,readOnly=false \
+   --volume runflannel,kind=host,source=/run/flannel,readOnly=false \
+   --volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
+   --mount volume=runsystemd,target=/run/systemd \
+   --mount volume=runflannel,target=/run/flannel \
+   --mount volume=ssl,target=${ETCD_SSL_DIR} \
+   ${FLANNEL_IMG}:${FLANNEL_VER} \
+   -- --ip-masq=true
+
+ExecStopPost=/usr/bin/rkt gc --mark-only
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild
deleted file mode 120000
index 98cd0d968f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-flannel-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild
new file mode 100644
index 0000000000..24aa61104f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm64"
+else
+	KEYWORDS="amd64 arm64"
+fi
+
+inherit systemd
+
+DESCRIPTION="flannel"
+HOMEPAGE="https://github.com/coreos/flannel"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-admin/sdnotify-proxy"
+S="$WORKDIR"
+
+src_install() {
+	sed "s/{{flannel_ver}}/${PV}/" "${FILESDIR}"/flanneld.service >"${T}"/flanneld.service
+	systemd_dounit "${T}"/flanneld.service
+
+	insinto /usr/lib/systemd/network
+	doins "${FILESDIR}"/50-flannel.network
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r3.ebuild
new file mode 120000
index 0000000000..98cd0d968f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.5.5-r3.ebuild
@@ -0,0 +1 @@
+flannel-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
index 24aa61104f..11d590ad5b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=4
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64"
 else
-	KEYWORDS="amd64 arm64"
+	KEYWORDS="amd64"
 fi
 
 inherit systemd
@@ -19,11 +19,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-admin/sdnotify-proxy"
+RDEPEND="app-emulation/rkt"
 S="$WORKDIR"
 
 src_install() {
-	sed "s/{{flannel_ver}}/${PV}/" "${FILESDIR}"/flanneld.service >"${T}"/flanneld.service
+	sed "s/{{flannel_ver}}/${PV}/" "${FILESDIR}"/flanneld-rkt.service >"${T}"/flanneld.service
 	systemd_dounit "${T}"/flanneld.service
 
 	insinto /usr/lib/systemd/network