From: khemendra kumar <khemendra.kumar@huawei.com>
Date: Tue, 26 May 2020 11:36:46 +0000 (+0000)
Subject: Merge "Home page carousel"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=09be4db91a212cf2f6f6815db8f0e9ebd21697d0;hp=5c2048d4d3e672783eea4f306aa9a03f33a1a9f2;p=eliot.git

Merge "Home page carousel"
---

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"