Merge "[K8s] Create service folders for addons and configs"

This commit is contained in:
Jenkins 2016-10-11 08:50:21 +00:00 committed by Gerrit Code Review
commit 2dd972b805
4 changed files with 19 additions and 0 deletions

View File

@ -50,6 +50,7 @@ Scripts:
- environ/kube-config
- systemd/kube-proxy.service
- systemd/kubelet.service
- kubeconfig.yaml
Options:
captureStdout: true

View File

@ -0,0 +1,12 @@
apiVersion: v1
kind: Config
clusters:
- cluster:
server: http://%%MASTER_IP%%:8080
name: kubernetes
contexts:
- context:
cluster: kubernetes
user: ""
name: kubelet-context
current-context: kubelet-context

View File

@ -5,6 +5,8 @@
#Create log folder for Kubernetes services
mkdir -p /var/run/murano-kubernetes
mkdir -p /etc/kubernetes/
mkdir -p /etc/kubernetes/addons
if [[ $(which systemctl) ]]; then
systemctl stop kube*

View File

@ -6,6 +6,7 @@
# $4 - USE_CALICO
mkdir -p /var/run/murano-kubernetes
mkdir -p /etc/kubernetes/
if [[ $(which systemctl) ]]; then
@ -54,4 +55,7 @@ else
service kube-proxy start
fi
sed -i.bak "s/%%MASTER_IP%%/$3/g" kubeconfig.yaml
cp -f kubeconfig.yaml /etc/kubernetes/
sleep 1