Merge pull request #424 from aabed/master

Update the template to version 1.2.2
This commit is contained in:
Phillip Wittrock
2016-07-15 08:46:52 -07:00
committed by GitHub
@@ -184,7 +184,7 @@ coreos:
Documentation=http://kubernetes.io/ Documentation=http://kubernetes.io/
Requires=network-online.target Requires=network-online.target
[Service] [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/ ExecStartPre=/bin/mkdir -p /opt/
ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz ExecStart=/opt/bin/curl-retry.sh --silent --location $KUBE_RELEASE_TARBALL --output /tmp/kubernetes.tgz
ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/ ExecStart=/bin/tar xzvf /tmp/kubernetes.tgz -C /tmp/
@@ -217,10 +217,10 @@ coreos:
ExecStart=/opt/kubernetes/server/bin/kube-apiserver \ ExecStart=/opt/kubernetes/server/bin/kube-apiserver \
--insecure-bind-address=0.0.0.0 \ --insecure-bind-address=0.0.0.0 \
--advertise-address=$public_ipv4 \ --advertise-address=$public_ipv4 \
--port=8080 \ --insecure-port=8080 \
$ETCD_SERVERS \ $ETCD_SERVERS \
--service-cluster-ip-range=10.16.0.0/12 \ --service-cluster-ip-range=10.16.0.0/12 \
--cloud-provider=vagrant \ --cloud-provider= \
--logtostderr=true --logtostderr=true
Restart=always Restart=always
RestartSec=10 RestartSec=10
@@ -281,7 +281,7 @@ coreos:
[Service] [Service]
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests/ ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests/
ExecStart=/opt/kubernetes/server/bin/kubelet \ 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 \ --address=0.0.0.0 \
--port=10250 \ --port=10250 \
--hostname-override=%H \ --hostname-override=%H \