[flink-kubernetes-operator] branch main updated: [FLINK-30187] Get operator log considering namespace

[gy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new b8483822 [FLINK-30187] Get operator log considering namespace
b8483822 is described below

commit b8483822516c526b8da19e031a2c695c2c59f207
Author: Gabor Somogyi <ga...@apple.com>
AuthorDate: Thu Nov 24 09:23:26 2022 +0100

    [FLINK-30187] Get operator log considering namespace
---
 e2e-tests/utils.sh | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/utils.sh b/e2e-tests/utils.sh
index b3912d01..e38f9631 100755
--- a/e2e-tests/utils.sh
+++ b/e2e-tests/utils.sh
@@ -83,15 +83,32 @@ function wait_for_jobmanager_running() {
     wait_for_logs $jm_pod_name "Rest endpoint listening at" ${TIMEOUT} || exit 1
 }
 
+function get_operator_pod_namespace() {
+    operator_pod_namespace=$(kubectl get pods --selector="app.kubernetes.io/name=flink-kubernetes-operator" -o jsonpath='{..metadata.namespace}' --all-namespaces)
+    if [ "$(grep -c . <<<"${operator_pod_namespace}")" != 1 ]; then
+      echo "Invalid operator pod namespace: ${operator_pod_namespace}" >&2
+      exit 1
+    fi
+    echo "${operator_pod_namespace}"
+}
+
 function get_operator_pod_name() {
-   operator_pod_name=$(kubectl get pods --selector="app.kubernetes.io/name=flink-kubernetes-operator" -o jsonpath='{..metadata.name}')
-   echo "${operator_pod_name}"
+    operator_pod_name=$(kubectl get pods --selector="app.kubernetes.io/name=flink-kubernetes-operator" -o jsonpath='{..metadata.name}' --all-namespaces)
+    if [ "$(grep -c . <<<"${operator_pod_name}")" != 1 ]; then
+      echo "Invalid operator pod name: ${operator_pod_name}" >&2
+      exit 1
+    fi
+    echo "${operator_pod_name}"
 }
 
 function get_jm_pod_name() {
-   CLUSTER_ID=$1
-   jm_pod_name=$(kubectl get pods --selector="app=${CLUSTER_ID},component=jobmanager" -o jsonpath='{..metadata.name}')
-   echo $jm_pod_name
+    CLUSTER_ID=$1
+    jm_pod_name=$(kubectl get pods --selector="app=${CLUSTER_ID},component=jobmanager" -o jsonpath='{..metadata.name}')
+    if [ "$(grep -c . <<<"${jm_pod_name}")" != 1 ]; then
+      echo "Invalid job manager pod name: ${jm_pod_name}" >&2
+      exit 1
+    fi
+    echo "${jm_pod_name}"
 }
 
 function retry_times() {
@@ -115,8 +132,10 @@ function retry_times() {
 
 function check_operator_log_for_errors {
   echo "Checking for operator log errors..."
+  operator_pod_namespace=$(get_operator_pod_namespace)
   operator_pod_name=$(get_operator_pod_name)
-  errors=$(kubectl logs "${operator_pod_name}" \
+  echo "Operator namespace: ${operator_pod_namespace} pod: ${operator_pod_name}"
+  errors=$(kubectl logs -n "${operator_pod_namespace}" "${operator_pod_name}" \
       | grep -v "Exception while listing jobs" `#https://issues.apache.org/jira/browse/FLINK-30146` \
       | grep -v "Failed to submit a listener notification task" `#https://issues.apache.org/jira/browse/FLINK-30147` \
       | grep -v "Failed to submit job to session cluster" `#https://issues.apache.org/jira/browse/FLINK-30148` \