From: Srinivasan Selvam <srinivasan.s.n@huawei.com>
Date: Tue, 28 Apr 2020 12:15:14 +0000 (+0530)
Subject: CentosEnv Edge node k8s version fix
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=0d4e5df79aced4d2f1a4af53a4aaa7729f71c9b8;p=eliot.git

CentosEnv Edge node k8s version fix

Kube-config missing in ubuntu fix

Signed-off-by: Srinivasan Selvam <srinivasan.s.n@huawei.com>
Change-Id: Ieb6339a6157ebb79abae8d7093dc71c14bd5ebc0
---

diff --git a/blueprints/iotgateway/scripts/common_centos.sh b/blueprints/iotgateway/scripts/common_centos.sh
index d833198..100525f 100755
--- a/blueprints/iotgateway/scripts/common_centos.sh
+++ b/blueprints/iotgateway/scripts/common_centos.sh
@@ -56,7 +56,7 @@ EOF
 setenforce 0
 sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config
 
-yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes
+yum install -y kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} kubectl-${KUBE_VERSION} --disableexcludes=kubernetes
 systemctl enable --now kubelet
 
 sudo yum install -y kubeadm-${KUBE_VERSION}
diff --git a/blueprints/iotgateway/scripts/k8smaster.sh b/blueprints/iotgateway/scripts/k8smaster.sh
index 924ee1d..d4ca7b5 100644
--- a/blueprints/iotgateway/scripts/k8smaster.sh
+++ b/blueprints/iotgateway/scripts/k8smaster.sh
@@ -49,6 +49,8 @@ if ! kubectl get nodes; then
     echo "export KUBECONFIG=/etc/kubernetes/admin.conf" | \
       tee -a "${HOME}/.profile"
     source "${HOME}/.profile"
+    mkdir -p "${HOME}/.kube"
+    sudo cp -i /etc/kubernetes/admin.conf "${HOME}/.kube/config"
   else
     mkdir -p "${HOME}/.kube"
     sudo cp -i /etc/kubernetes/admin.conf "${HOME}/.kube/config"
diff --git a/blueprints/uCPE/scripts/common_centos.sh b/blueprints/uCPE/scripts/common_centos.sh
index d833198..100525f 100755
--- a/blueprints/uCPE/scripts/common_centos.sh
+++ b/blueprints/uCPE/scripts/common_centos.sh
@@ -56,7 +56,7 @@ EOF
 setenforce 0
 sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config
 
-yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes
+yum install -y kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} kubectl-${KUBE_VERSION} --disableexcludes=kubernetes
 systemctl enable --now kubelet
 
 sudo yum install -y kubeadm-${KUBE_VERSION}
diff --git a/blueprints/uCPE/scripts/k8smaster.sh b/blueprints/uCPE/scripts/k8smaster.sh
index 924ee1d..d4ca7b5 100644
--- a/blueprints/uCPE/scripts/k8smaster.sh
+++ b/blueprints/uCPE/scripts/k8smaster.sh
@@ -49,6 +49,8 @@ if ! kubectl get nodes; then
     echo "export KUBECONFIG=/etc/kubernetes/admin.conf" | \
       tee -a "${HOME}/.profile"
     source "${HOME}/.profile"
+    mkdir -p "${HOME}/.kube"
+    sudo cp -i /etc/kubernetes/admin.conf "${HOME}/.kube/config"
   else
     mkdir -p "${HOME}/.kube"
     sudo cp -i /etc/kubernetes/admin.conf "${HOME}/.kube/config"