From df281eb66c0ad0a0b8735279c6b515a3e4d60890 Mon Sep 17 00:00:00 2001
From: Dmytro Dovbii <ddovbii@mirantis.com>
Date: Wed, 28 Sep 2016 19:24:41 +0300
Subject: [PATCH] [K8s] Create service folders for addons and configs

This patch creates directory for kubernetes addons
and put kubeconfig.yaml file to k8s nodes

Change-Id: I943724b71151de2ce6e95259ddab3d596b94e214
---
 .../package/Resources/KubeMinionSetup.template       |  1 +
 .../package/Resources/scripts/kubeconfig.yaml        | 12 ++++++++++++
 .../package/Resources/scripts/master-kube-setup.sh   |  2 ++
 .../package/Resources/scripts/minion-kube-setup.sh   |  4 ++++
 4 files changed, 19 insertions(+)
 create mode 100644 Kubernetes/KubernetesCluster/package/Resources/scripts/kubeconfig.yaml

diff --git a/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template b/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
index 8a4ed80..82af461 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
+++ b/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
@@ -50,6 +50,7 @@ Scripts:
       - environ/kube-config
       - systemd/kube-proxy.service
       - systemd/kubelet.service
+      - kubeconfig.yaml
 
     Options:
       captureStdout: true
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/kubeconfig.yaml b/Kubernetes/KubernetesCluster/package/Resources/scripts/kubeconfig.yaml
new file mode 100644
index 0000000..68a9c2c
--- /dev/null
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/kubeconfig.yaml
@@ -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
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
index f1e28bc..520bea0 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
@@ -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*
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh
index f97d7a0..8f2b89f 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/minion-kube-setup.sh
@@ -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
\ No newline at end of file