- Implemented kubernetes cluster readiness check via polling during project initialization

Author: paliarush

init_project.sh

@@ -227,6 +227,7 @@ if [[ $(isMinikubeRunning) -eq 0 ]]; then
     status "Starting minikube"
     #echo "$(python -c 'import os,sys;print(os.path.realpath("."));')/ -alldirs -mapall="$(id -u)":"$(id -g)" $(minikube ip)" | sudo tee -a /etc/exports && sudo nfsd restart
     minikube start --cpus=2 --memory=4096
+#    minikube start --cache-images --cpus=2 --memory=4096
     # hanged in some cases todo
 #    minikube start --cpus=2 --memory=4096 2> >(logError) | {
 #      while IFS= read -r line
@@ -239,15 +240,16 @@ if [[ $(isMinikubeRunning) -eq 0 ]]; then
 fi
 status "Configuring kubernetes cluster on the minikube"
 # TODO: Optimize. Helm tiller must be initialized and started before environment configuration can begin
-helm init && sleep 10
+helm init
+waitForKubernetesPodToRun 'tiller-deploy'
+
 # TODO: change k-rebuild-environment to comply with formatting requirements
 if [[ "${disable_nfs}" == 1 ]]; then
     bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh" -d
 else
     bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh"
 fi
 
-
 minikube_ip="$(minikube service magento2-monolith --url | grep -oE '[0-9][^:]+' | head -1)"
 status "Saving minikube IP to etc/config.yaml (${minikube_ip})"
 sed -i.back "s|ip_address: \".*\"|ip_address: \"${minikube_ip}\"|g" "${config_path}"

k-restart

@@ -7,10 +7,11 @@ cd "$(dirname "${BASH_SOURCE[0]}")" && vagrant_dir=$PWD
 source "${vagrant_dir}/scripts/functions.sh"
 resetNestingLevel
 
-if [[ $(isMinikubeRunning) -eq 1 ]]; then
+if [[ $(isMinikubeRunning) -eq 1 || $(isMinikubeSaved) -eq 1 ]]; then
     minikube stop 2> >(logError)
 fi
 
 minikube start --cpus=2 --memory=4096 2> >(logError)
+#minikube start --cache-images --cpus=2 --memory=4096 2> >(logError)
 
 info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"

scripts/functions.sh

@@ -227,10 +227,41 @@ function isMinikubeStopped() {
     fi
 }
 
+function isMinikubeSaved() {
+    minikube_status="$(minikube status | grep minikube: 2> >(log))"
+    if [[ ${minikube_status} == "minikube: Saved" ]]; then
+        echo 1
+    fi
+}
+
 # TODO: Add suspended
 
 function isMinikubeInitialized() {
-    if [[ $(isMinikubeRunning) -eq 1 || $(isMinikubeStopped) -eq 1 ]]; then
+    if [[ $(isMinikubeRunning) -eq 1 || $(isMinikubeStopped) -eq 1 || $(isMinikubeSaved) -eq 1 ]]; then
         echo 1
     fi
 }
+
+function waitForKubernetesPodToRun()
+{
+    set +e
+
+    if [[ -n "${1}" ]]; then
+        pod_id="${1}"
+    else
+        error "Argument missing for 'waitForKubernetesPodToRun'"
+        set -e
+        exit 1
+    fi
+
+    COUNTER=0
+    pod_status=$(kubectl get pods --all-namespaces | grep -hE "${pod_id}-[a-z0-9\-]+" | grep -o 'Running')
+
+    while [[ $pod_status != 'Running' && $COUNTER -lt 240 ]] ; do
+        sleep 3
+        let COUNTER+=3
+        status "Waiting for pod (${pod_id}) to run"
+        pod_status=$(kubectl get pods --all-namespaces | grep -hE "${pod_id}-[a-z0-9\-]+" | grep -o 'Running')
+    done
+    set -e
+}

scripts/guest/m-reinstall

@@ -134,9 +134,8 @@ if [[ ${magento_home_page_content} =~ ${pattern} ]]; then
 
     bash "${VAGRANT_ROOT}/scripts/guest/warm_up_cache"
 
-    status "Generating XSD references for PHP Storm"
-    php "${MAGENTO_ROOT}/bin/magento" dev:urn-catalog:generate "${vagrant_dir}/.idea/misc.xml"
-    sed -i "s|${MAGENTO_ROOT}|${MAGENTO_ROOT_HOST}|g" "${vagrant_dir}/.idea/misc.xml"
+    status "Generating XSD references for PHP Storm in the background"
+    php "${MAGENTO_ROOT}/bin/magento" dev:urn-catalog:generate "${vagrant_dir}/.idea/misc.xml" && sed -i "s|${MAGENTO_ROOT}|${MAGENTO_ROOT_HOST}|g" "${vagrant_dir}/.idea/misc.xml" &
 
     decrementNestingLevel
     success "Magento reinstalled successfully"

scripts/host/k_rebuild_environment.sh

@@ -35,12 +35,8 @@ cd "${vagrant_dir}/etc/helm" && helm install \
     --set global.checkout.volumeHostPath="${vagrant_dir}" .
 
 # TODO: Waiting for containers to initialize before proceeding
-sleep 7
-
-
-## Bypass Helm
-#cd "${vagrant_dir}" && python local_deploy.py --all --ingress \
-#    && kubectl patch deployment magento2-monolith -p \
-#  "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
+waitForKubernetesPodToRun 'magento2-monolith'
+waitForKubernetesPodToRun 'magento2-mysql'
+waitForKubernetesPodToRun 'magento2-redis-master'
 
 exit 0