diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network deleted file mode 100644 index e5d48d739b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Name=flannel* - -[Link] -Unmanaged=yes 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 deleted file mode 100644 index 2cf5cd964d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service +++ /dev/null @@ -1,55 +0,0 @@ -[Unit] -Description=Network fabric for containers -Documentation=https://github.com/coreos/flannel -After=etcd.service etcd2.service -Before=docker.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 \ - --volume certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ - --volume resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ - --volume hosts,kind=host,source=/etc/hosts,readOnly=true \ - --mount volume=runsystemd,target=/run/systemd \ - --mount volume=runflannel,target=/run/flannel \ - --mount volume=ssl,target=${ETCD_SSL_DIR} \ - --mount volume=certs,target=/etc/ssl/certs \ - --mount volume=resolv,target=/etc/resolv.conf \ - --mount volume=hosts,target=/etc/hosts \ - ${FLANNEL_IMG}:${FLANNEL_VER} \ - --exec /opt/bin/flanneld \ - -- --ip-masq=true - -# Update docker options -ExecStartPost=/usr/bin/rkt run --net=host \ - --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \ - --insecure-options=image \ - --volume runvol,kind=host,source=/run,readOnly=false \ - --mount volume=runvol,target=/run \ - ${FLANNEL_IMG}:${FLANNEL_VER} \ - --exec /opt/bin/mk-docker-opts.sh -- -d /run/flannel_docker_opts.env -i - -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.6.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild deleted file mode 120000 index 98cd0d968f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.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.6.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild deleted file mode 120000 index 98cd0d968f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.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-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild deleted file mode 100644 index e8b6309ff1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2014 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" -else - KEYWORDS="amd64 arm64" -fi - -inherit systemd coreos-go-utils - -DESCRIPTION="flannel" -HOMEPAGE="https://github.com/coreos/flannel" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -RDEPEND="app-emulation/rkt" -S="$WORKDIR" - -src_install() { - local arch_tag="$(go_arch)" - sed "s/{{flannel_ver}}/v${PV}-${arch_tag}/" "${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/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -