Merge pull request #424 from aabed/master

Update the template to version 1.2.2
pull/855/head
Phillip Wittrock 2016-07-15 08:46:52 -07:00 committed by GitHub
commit cf86f98704
1 changed files with 4 additions and 4 deletions

View File

@ -184,7 +184,7 @@ coreos:
Documentation=http://kubernetes.io/
Requires=network-online.target
[Service]
Environment=KUBE_RELEASE_TARBALL=https://github.com/kubernetes/kubernetes/releases/download/v1.1.2/kubernetes.tar.gz
Environment=KUBE_RELEASE_TARBALL=https://github.com/kubernetes/kubernetes/releases/download/v1.2.2/kubernetes.tar.gz
ExecStartPre=/bin/mkdir -p /opt/
ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz
ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/
@ -217,10 +217,10 @@ coreos:
ExecStart=/opt/kubernetes/server/bin/kube-apiserver \
--insecure-bind-address=0.0.0.0 \
--advertise-address=$public_ipv4 \
--port=8080 \
--insecure-port=8080 \
$ETCD_SERVERS \
--service-cluster-ip-range=10.16.0.0/12 \
--cloud-provider=vagrant \
--cloud-provider= \
--logtostderr=true
Restart=always
RestartSec=10
@ -281,7 +281,7 @@ coreos:
[Service]
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests/
ExecStart=/opt/kubernetes/server/bin/kubelet \
--docker-endpoint=unix:/var/run/weave/weave.sock \
--docker-endpoint=unix://var/run/weave/weave.sock \
--address=0.0.0.0 \
--port=10250 \
--hostname-override=%H \