mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 23:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2553 from euank/flanneld-timeout

Browse Source 
app-admin/flannel-wrapper: update timeouts & update version
This commit is contained in:
Euan Kemp 2017-04-27 15:49:26 -07:00 committed by GitHub
commit 472522846a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,8 @@ Before=docker.service
[Service] [Service]
Type=oneshot Type=oneshot
TimeoutStartSec=60
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="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"

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

@ -8,10 +8,11 @@ Requires=flannel-docker-opts.service
Type=notify Type=notify
Restart=always Restart=always
RestartSec=10s RestartSec=10s
TimeoutStartSec=300
LimitNOFILE=40000 LimitNOFILE=40000
LimitNPROC=1048576 LimitNPROC=1048576
Environment="FLANNEL_IMAGE_TAG=v0.7.0" Environment="FLANNEL_IMAGE_TAG=v0.7.1"
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

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.0-r2.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.7.1.ebuild vendored
View File