github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18456 from thockin/bump-flannel-ver

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-11 00:34:39 -08:00
parent 90b5db167f 6b830cf229
commit 1b90941841
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/centos/config-build.sh
View File

@@ -20,7 +20,7 @@
RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
# Define flannel version to use.
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
# Define etcd version to use.
ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}

2
cluster/centos/node/scripts/flannel.sh
View File

@@ -32,7 +32,7 @@ Before=docker.service
[Service]
EnvironmentFile=-/opt/kubernetes/cfg/flannel
ExecStart=/opt/kubernetes/bin/flanneld \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
ExecStart=/opt/kubernetes/bin/flanneld --ip-masq \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker
Type=notify