github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17616 from ZJU-SEL/upgrade-k8s-v1.1.2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-21 00:35:20 -08:00
parent d79ccddc83 e0bcf11abf
commit 8c9d44fa9f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/ubuntu/download-release.sh
View File

@@ -53,7 +53,7 @@ fi
cp $ETCD/etcd $ETCD/etcdctl binaries/master cp $ETCD/etcd $ETCD/etcdctl binaries/master
# k8s # k8s
KUBE_VERSION=${KUBE_VERSION:-"1.0.6"} KUBE_VERSION=${KUBE_VERSION:-"1.1.2"}
echo "Prepare kubernetes ${KUBE_VERSION} release ..." echo "Prepare kubernetes ${KUBE_VERSION} release ..."
if [ ! -f kubernetes.tar.gz ] ; then if [ ! -f kubernetes.tar.gz ] ; then
curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v${KUBE_VERSION}/kubernetes.tar.gz -o kubernetes.tar.gz curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v${KUBE_VERSION}/kubernetes.tar.gz -o kubernetes.tar.gz

4
cluster/ubuntu/util.sh
View File

@@ -393,7 +393,7 @@ function provision-master() {
cp ~/kube/init_scripts/* /etc/init.d/ cp ~/kube/init_scripts/* /etc/init.d/
groupadd -f -r kube-cert groupadd -f -r kube-cert
\"${PROXY_SETTING}\" ~/kube/make-ca-cert.sh \"${MASTER_IP}\" \"${EXTRA_SANS}\" ${PROXY_SETTING} ~/kube/make-ca-cert.sh \"${MASTER_IP}\" \"${EXTRA_SANS}\"
mkdir -p /opt/bin/ mkdir -p /opt/bin/
cp ~/kube/master/* /opt/bin/ cp ~/kube/master/* /opt/bin/
service etcd start service etcd start
@@ -502,7 +502,7 @@ function provision-masterandnode() {
cp ~/kube/init_scripts/* /etc/init.d/ cp ~/kube/init_scripts/* /etc/init.d/
groupadd -f -r kube-cert groupadd -f -r kube-cert
\"${PROXY_SETTING}\" ~/kube/make-ca-cert.sh \"${MASTER_IP}\" \"${EXTRA_SANS}\" ${PROXY_SETTING} ~/kube/make-ca-cert.sh \"${MASTER_IP}\" \"${EXTRA_SANS}\"
mkdir -p /opt/bin/ mkdir -p /opt/bin/
cp ~/kube/master/* /opt/bin/ cp ~/kube/master/* /opt/bin/
cp ~/kube/minion/* /opt/bin/ cp ~/kube/minion/* /opt/bin/