summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile2
-rw-r--r--utils/k8s_setup/k8s_config_pre.sh14
-rw-r--r--utils/k8s_setup/kubectl_install.sh2
3 files changed, 17 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c91a60f..ef63e3b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -49,5 +49,7 @@ RUN git config --global http.sslVerify false
RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+RUN bash ${BOTTLENECKS_REPO_DIR}/utils/k8s_setup/kubectl_install.sh
+
RUN pip install -r ${BOTTLENECKS_REPO_DIR}/requirements/requirements.txt
RUN pip install -U ${BOTTLENECKS_REPO_DIR}
diff --git a/utils/k8s_setup/k8s_config_pre.sh b/utils/k8s_setup/k8s_config_pre.sh
index 96f714b..38e71d2 100644
--- a/utils/k8s_setup/k8s_config_pre.sh
+++ b/utils/k8s_setup/k8s_config_pre.sh
@@ -64,3 +64,17 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
else
echo "BOTTLENECKS EROOR: unrecognized installer"
fi
+
+if [[ -f ${K8S_CONFIG} ]]; then
+ if [[ -d ~/.kube ]]; then
+ cp ${K8S_CONFIG} ~/.kube/config
+ echo "BOTTLENECKS INFO: copying k8s config to ~./kube"
+ else
+ mkdir ~/.kube
+ cp ${K8S_CONFIG} ~/.kube/config
+ echo "BOTTLENECKS INFO: copying k8s config to ~./kube"
+ fi
+else
+ echo "BOTTLENECKS ERROR: k8s config file does no exit (${K8S_CONFIG})"
+ exit 1
+fi
diff --git a/utils/k8s_setup/kubectl_install.sh b/utils/k8s_setup/kubectl_install.sh
index 14f97f2..22c6197 100644
--- a/utils/k8s_setup/kubectl_install.sh
+++ b/utils/k8s_setup/kubectl_install.sh
@@ -9,7 +9,7 @@
##############################################################################
OS_TYPE=$(uname -a)
-OS_UBUNTU=$(echo $OS_TYPE | grep ubuntu)
+OS_UBUNTU=$(echo $OS_TYPE | grep Ubuntu)
if [[ $OS_UBUNTU ]]; then
apt-get update && apt-get install -y apt-transport-https