mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

flannel-wrapper: Enable on arm64

Browse Source 
Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2017-06-05 10:05:36 -07:00
parent 46fea78177
commit 6cddc1cb15
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service vendored
View File

@ -9,7 +9,7 @@ Before=docker.service
[Service] [Service]
Type=oneshot Type=oneshot
Environment="FLANNEL_IMAGE_TAG=v0.7.1" Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid"
Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh" Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh"

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

@ -12,7 +12,7 @@ TimeoutStartSec=300
LimitNOFILE=40000 LimitNOFILE=40000
LimitNPROC=1048576 LimitNPROC=1048576
Environment="FLANNEL_IMAGE_TAG=v0.7.1" Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
Environment="FLANNEL_OPTS=--ip-masq=true" Environment="FLANNEL_OPTS=--ip-masq=true"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper.uuid" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper.uuid"
EnvironmentFile=-/run/flannel/options.env EnvironmentFile=-/run/flannel/options.env

16
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1-r1.ebuild vendored
View File

@ -8,7 +8,7 @@ inherit systemd
DESCRIPTION="flannel (System Application Container)" DESCRIPTION="flannel (System Application Container)"
HOMEPAGE="https://github.com/coreos/flannel" HOMEPAGE="https://github.com/coreos/flannel"
KEYWORDS="amd64" KEYWORDS="amd64 arm64"
SRC_URI="" SRC_URI=""
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
@ -23,11 +23,21 @@ RDEPEND="
S="$WORKDIR" S="$WORKDIR"
src_install() { src_install() {
local tag="v${PV}"
if [[ "${ARCH}" != "amd64" ]]; then
tag+="-${ARCH}"
fi
exeinto /usr/lib/coreos exeinto /usr/lib/coreos
doexe "${FILESDIR}"/flannel-wrapper doexe "${FILESDIR}"/flannel-wrapper
systemd_dounit "${FILESDIR}"/flanneld.service sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
systemd_dounit "${FILESDIR}"/flannel-docker-opts.service "${FILESDIR}"/flanneld.service > ${T}/flanneld.service
systemd_dounit ${T}/flanneld.service
sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
"${FILESDIR}"/flannel-docker-opts.service > ${T}/flannel-docker-opts.service
systemd_dounit ${T}/flannel-docker-opts.service
insinto /usr/lib/systemd/network insinto /usr/lib/systemd/network
doins "${FILESDIR}"/50-flannel.network doins "${FILESDIR}"/50-flannel.network

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild vendored
View File

@ -82,11 +82,11 @@ RDEPEND="${RDEPEND}
app-emulation/xenstore app-emulation/xenstore
sys-auth/realmd sys-auth/realmd
sys-auth/sssd sys-auth/sssd
app-admin/flannel-wrapper
)" )"
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
app-admin/etcd-wrapper app-admin/etcd-wrapper
app-admin/flannel-wrapper
app-admin/fleet app-admin/fleet
app-admin/kubelet-wrapper app-admin/kubelet-wrapper
app-admin/locksmith app-admin/locksmith