From 0d4e5df79aced4d2f1a4af53a4aaa7729f71c9b8 Mon Sep 17 00:00:00 2001 From: Srinivasan Selvam Date: Tue, 28 Apr 2020 17:45:14 +0530 Subject: [PATCH] CentosEnv Edge node k8s version fix Kube-config missing in ubuntu fix Signed-off-by: Srinivasan Selvam Change-Id: Ieb6339a6157ebb79abae8d7093dc71c14bd5ebc0 --- blueprints/iotgateway/scripts/common_centos.sh | 2 +- blueprints/iotgateway/scripts/k8smaster.sh | 2 ++ blueprints/uCPE/scripts/common_centos.sh | 2 +- blueprints/uCPE/scripts/k8smaster.sh | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) 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" -- 2.16.6