fix(github actions): Made some checks on pod names more specific to a…

…voit fals positives.
apache · Jan 30, 2024 · 42a8569 · 42a8569
1 parent b115f1d
commit 42a8569
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/kamel-cleanup/uninstall-global-operator.sh b/.github/actions/kamel-cleanup/uninstall-global-operator.sh
@@ -91,7 +91,7 @@ if [ "${has_olm}" == "true" ]; then
     xargs -I '{}' kubectl delete csv '{}' -n ${GLOBAL_OPERATOR_NAMESPACE} &> /dev/null
 else
   kubectl get deploy -n ${GLOBAL_OPERATOR_NAMESPACE} | \
-    grep camel-k | awk '{print $1}' | \
+    grep camel-k-operator | awk '{print $1}' | \
     xargs -I '{}' kubectl delete deploy '{}' -n ${GLOBAL_OPERATOR_NAMESPACE} &> /dev/null
 fi
 
@@ -102,7 +102,7 @@ sleep 3
 #
 timeout=180
 i=1
-command="kubectl get pods -n ${GLOBAL_OPERATOR_NAMESPACE} 2> /dev/null | grep camel-k &> /dev/null"
+command="kubectl get pods -n ${GLOBAL_OPERATOR_NAMESPACE} 2> /dev/null | grep camel-k-operator &> /dev/null"
 
 while eval "${command}"
 do

diff --git a/.github/actions/kamel-preflight-test/preflight-test.sh b/.github/actions/kamel-preflight-test/preflight-test.sh
@@ -40,7 +40,7 @@ waitForOperator() {
   #
   local timeout=360
   local i=1
-  local command="kubectl get pods -n ${NAMESPACE} 2> /dev/null | grep camel-k | grep Running &> /dev/null"
+  local command="kubectl get pods -n ${NAMESPACE} 2> /dev/null | grep camel-k-operator | grep Running &> /dev/null"
 
   until eval "${command}"
   do
@@ -225,7 +225,7 @@ waitForOperator
 echo "Finding the operator pod identifier"
 for i in {1..5}
 do
-  camel_operator=$(kubectl get pods -n ${NAMESPACE} | grep camel-k | grep Running | awk '{print $1}')
+  camel_operator=$(kubectl get pods -n ${NAMESPACE} | grep camel-k-operator | grep Running | awk '{print $1}')
   if [ -n "${camel_operator}" ]; then
     break
   fi