From c9815207d4ddcbb38c994100a3f57104ebdbd637 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Tue, 17 Mar 2015 00:13:06 +0300 Subject: [PATCH] Updates k8s DIB element DIB element was updated to match latest k8s implementation: 1. Added confd 2. init.d scripts and k8s configs were moved to k8s implementation Change-Id: I2433561122ae3b4ca99e0c732b6e4bd3f863e167 --- .../kubernetes/install.d/57-kubernetes | 37 ++----------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/contrib/elements/kubernetes/install.d/57-kubernetes b/contrib/elements/kubernetes/install.d/57-kubernetes index 751f83b16..094788d5c 100755 --- a/contrib/elements/kubernetes/install.d/57-kubernetes +++ b/contrib/elements/kubernetes/install.d/57-kubernetes @@ -49,43 +49,14 @@ cp ${SVC_ROOT}/flannel/bin/flanneld ${SVC_ROOT}/flanneld rm -rf ${SVC_ROOT}/flannel -# Obtain init scripts -git clone https://github.com/GoogleCloudPlatform/kubernetes.git kubernetes-git - -pushd ${SVC_ROOT}/kubernetes-git/cluster/ubuntu-cluster - -for file in etcd flanneld kube-apiserver kube-controller-manager kube-proxy kube-scheduler kubelet; - do echo -e "start on runlevel [235]\r\nstop on runlevel [016]" >> ${SVC_ROOT}/kubernetes-git/cluster/ubuntu-cluster/init_conf/$file.conf; -done - -cp -R default_scripts/* /etc/default/ -cp -R init_conf/* /etc/init/ -cp -R initd_scripts/* /etc/init.d/ -popd - -cp -R ${SVC_ROOT}/kubernetes-git/cluster/ubuntu-cluster/* ${SVC_ROOT}/ - -sed -i 's/"$etcdVersion" != "2.0.0"/"${etcdVersion%.*}" != "2.0"/g' ${SVC_ROOT}/configure.sh - -rm -rf ${SVC_ROOT}/kubernetes-git # Update system PATH sed -i 's/PATH="/PATH="\/opt\/bin:\/opt\/go\/bin:/g' /etc/environment -update-rc.d etcd start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d flanneld start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d kube-apiserver start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d kube-controller-manager start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d kube-proxy start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d kube-scheduler start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d kubelet start 70 3 4 5 . stop 20 0 1 6 . -update-rc.d etcd disable -update-rc.d flanneld disable -update-rc.d kube-apiserver disable -update-rc.d kube-controller-manager disable -update-rc.d kube-proxy disable -update-rc.d kube-scheduler disable -update-rc.d kubelet disable +wget -O confd https://github.com/kelseyhightower/confd/releases/download/v0.7.1/confd-0.7.1-linux-amd64 +mv confd /usr/local/bin/confd +chmod +x /usr/local/bin/confd +mkdir -p /etc/confd/{conf.d,templates} popd \ No newline at end of file