Fix mac k8s connection tests (#58)

* add retry * update version
logzio · Dec 6, 2022 · fbcbcc2 · fbcbcc2
1 parent eb9ba7a
commit fbcbcc2
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 19 deletions.
diff --git a/Kubernetes/AKS/Kubernetes/prerequisites/mac/functions.bash b/Kubernetes/AKS/Kubernetes/prerequisites/mac/functions.bash
@@ -73,10 +73,20 @@ function can_k8s_cluster_connect_to_logzio_logs () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-logs-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 
@@ -129,10 +139,20 @@ function can_k8s_cluster_connect_to_logzio_metrics () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-metrics-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 

diff --git a/Kubernetes/EKS/Kubernetes/prerequisites/mac/functions.bash b/Kubernetes/EKS/Kubernetes/prerequisites/mac/functions.bash
@@ -73,10 +73,20 @@ function can_k8s_cluster_connect_to_logzio_logs () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-logs-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 
@@ -129,10 +139,20 @@ function can_k8s_cluster_connect_to_logzio_metrics () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-metrics-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 

diff --git a/Kubernetes/GKE/Kubernetes/prerequisites/mac/functions.bash b/Kubernetes/GKE/Kubernetes/prerequisites/mac/functions.bash
@@ -81,10 +81,20 @@ function can_k8s_cluster_connect_to_logzio_logs () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-logs-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-logs-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 
@@ -141,10 +151,20 @@ function can_k8s_cluster_connect_to_logzio_metrics () {
         return 3
     fi
 
-    sleep 5
+    local is_pod_completed=false
+    local retries=3
+    while [[ $retries -ne 0 ]]; do
+        local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
+        if [[ "$pod_status" == "Completed" ]]; then
+            is_pod_completed=true
+            break
+        fi
+
+        sleep 5
+        ((retries--))
+    done
 
-    local pod_status=$(kubectl get pods | grep logzio-metrics-connection-test | tr -s ' ' | cut -d ' ' -f3)
-    if [[ "$pod_status" != "Completed" ]]; then
+    if ! $is_pod_completed; then
         local pod_logs=$(kubectl logs logzio-metrics-connection-test 2>$task_error_file)
         local err=$(cat $task_error_file)
 

diff --git a/scripts/windows/agent.ps1 b/scripts/windows/agent.ps1
@@ -143,7 +143,7 @@ function Write-AgentSupport {
 
 
 # Agent version
-$script:AgentVersion = 'v1.0.27'
+$script:AgentVersion = 'v1.0.29'
 
 # Settings
 $ProgressPreference = 'SilentlyContinue'