From d3fdc91bf2af877362bd64b16811aa40efcc5827 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 27 Apr 2017 14:42:26 -0700 Subject: [PATCH 1/2] app-admin/flannel-wrapper: update timeouts See https://github.com/coreos/bugs/issues/1833 where this was requested. This has become more important with the more recent flannel releases including kubernetes and becoming larger as well. The value of 5 minutes is arbitrarily chosen as a reasonable increase over the default 90s. --- .../app-admin/flannel-wrapper/files/flannel-docker-opts.service | 1 - .../app-admin/flannel-wrapper/files/flanneld.service | 1 + ...l-wrapper-0.7.0-r2.ebuild => flannel-wrapper-0.7.0-r3.ebuild} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.7.0-r2.ebuild => flannel-wrapper-0.7.0-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service index 5e917fc4f4..bac28cfec9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service @@ -8,7 +8,6 @@ Before=docker.service [Service] Type=oneshot -TimeoutStartSec=60 Environment="FLANNEL_IMAGE_TAG=v0.7.0" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service index e6f036ffb4..0f3257885a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service @@ -8,6 +8,7 @@ Requires=flannel-docker-opts.service Type=notify Restart=always RestartSec=10s +TimeoutStartSec=300 LimitNOFILE=40000 LimitNPROC=1048576 diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r3.ebuild From 0894229a46e971d4ae0c5a12730fd64cce314f2b Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 27 Apr 2017 14:59:13 -0700 Subject: [PATCH 2/2] app-admin/flannel-wrapper: update to 0.7.1 Rote version bump --- .../app-admin/flannel-wrapper/files/flannel-docker-opts.service | 2 +- .../app-admin/flannel-wrapper/files/flanneld.service | 2 +- ...nel-wrapper-0.7.0-r3.ebuild => flannel-wrapper-0.7.1.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.7.0-r3.ebuild => flannel-wrapper-0.7.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service index bac28cfec9..ac0e4df468 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service @@ -9,7 +9,7 @@ Before=docker.service [Service] Type=oneshot -Environment="FLANNEL_IMAGE_TAG=v0.7.0" +Environment="FLANNEL_IMAGE_TAG=v0.7.1" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid" Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service index 0f3257885a..dfcd63b349 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service @@ -12,7 +12,7 @@ TimeoutStartSec=300 LimitNOFILE=40000 LimitNPROC=1048576 -Environment="FLANNEL_IMAGE_TAG=v0.7.0" +Environment="FLANNEL_IMAGE_TAG=v0.7.1" Environment="FLANNEL_OPTS=--ip-masq=true" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper.uuid" EnvironmentFile=-/run/flannel/options.env diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild