diff options
Diffstat (limited to 'utils/k8s_setup')
| -rw-r--r-- | utils/k8s_setup/k8s_config_pre.sh | 16 | ||||
| -rw-r--r-- | utils/k8s_setup/k8s_utils.py | 2 | ||||
| -rw-r--r-- | utils/k8s_setup/kubectl_install.sh | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/utils/k8s_setup/k8s_config_pre.sh b/utils/k8s_setup/k8s_config_pre.sh index 96f714bf..f57add78 100644 --- a/utils/k8s_setup/k8s_config_pre.sh +++ b/utils/k8s_setup/k8s_config_pre.sh @@ -60,7 +60,21 @@ while [[ $# > 0 ]] done if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - sshpass -p root scp -o StrictHostKeyChecking=no root@192.16.1.222:~/.kube/config ${K8S_CONFIG} + sshpass -p root scp -o StrictHostKeyChecking=no root@10.1.0.50:~/.kube/config ${K8S_CONFIG} 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/k8s_utils.py b/utils/k8s_setup/k8s_utils.py index a89889f3..ad2cc991 100644 --- a/utils/k8s_setup/k8s_utils.py +++ b/utils/k8s_setup/k8s_utils.py @@ -67,7 +67,7 @@ def get_deployment_status(name, namespace): def get_available_pods(name, namespace): CMD = ("kubectl get deployment --namespace={} | grep {}".format( - namespace, name) + " | awk '{print $5}'") + namespace, name) + " | awk '{print $4}'") available_pods = commands.getstatusoutput(CMD) return int(available_pods[1]) diff --git a/utils/k8s_setup/kubectl_install.sh b/utils/k8s_setup/kubectl_install.sh index 14f97f2b..22c6197b 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 |