bugfix: fix kind e2e test images (#4232)

* Fix version replace in gha-e2e Signed-off-by: trafalgarzzz <[email protected]> * Optimize diagnose shell scripts Signed-off-by: trafalgarzzz <[email protected]> --------- Signed-off-by: trafalgarzzz <[email protected]>
fluid-cloudnative · Jul 24, 2024 · 3a268df · 3a268df
1 parent b0452ed
commit 3a268df
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/.github/scripts/deploy-fluid-to-kind.sh b/.github/scripts/deploy-fluid-to-kind.sh
@@ -11,7 +11,7 @@ function get_image_tag() {
 
 function deploy_fluid() {
     echo "Replacing image tags in values.yaml with $IMAGE_TAG"
-    sed -i -E "s/(image: fluidcloudnative\/.+:)v[0-9]\.[0-9]\.[0-9]-[a-z0-9]+/\1$IMAGE_TAG/" charts/fluid/fluid/values.yaml
+    sed -i -E "s/version: &defaultVersion v[0-9]\.[0-9]\.[0-9]-[a-z0-9]+$/version: \&defaultVersion $IMAGE_TAG" charts/fluid/fluid/values.yaml
     kubectl create ns fluid-system
     helm install --create-namespace fluid charts/fluid/fluid
 }

diff --git a/tools/diagnose-fluid-alluxio.sh b/tools/diagnose-fluid-alluxio.sh
@@ -32,9 +32,14 @@ helm_get() {
   run helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
 }
 
+helm_get_runtime() {
+  run env HELM_DRIVER=configmap helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
+}
+
 pod_status() {
   local namespace=${1:-"default"}
   run kubectl get po -owide -n ${namespace} &>"$diagnose_dir/pods-${namespace}.log"
+  run kubectl get po -oyaml -n ${namespace} &>>"$diagnose_dir/pods-${namespace}.log"
 }
 
 fluid_pod_logs() {
@@ -96,7 +101,7 @@ archive() {
 pd_collect() {
   echo "Start collecting, runtime-name=${runtime_name}, runtime-namespace=${runtime_namespace}"
   helm_get "${fluid_name}"
-  helm_get "${runtime_name}"
+  helm_get_runtime "${runtime_name}"
   pod_status "${fluid_namespace}"
   pod_status "${runtime_namespace}"
   runtime_pod_logs

diff --git a/tools/diagnose-fluid-jindo.sh b/tools/diagnose-fluid-jindo.sh
@@ -32,9 +32,14 @@ helm_get() {
   run helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
 }
 
+helm_get_runtime() {
+  run env HELM_DRIVER=configmap helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
+}
+
 pod_status() {
   local namespace=${1:-"default"}
   run kubectl get po -owide -n ${namespace} &>"$diagnose_dir/pods-${namespace}.log"
+  run kubectl get po -oyaml -n ${namespace} &>>"$diagnose_dir/pods-${namespace}.log"
 }
 
 fluid_pod_logs() {
@@ -90,7 +95,7 @@ archive() {
 pd_collect() {
   echo "Start collecting, runtime-name=${runtime_name}, runtime-namespace=${runtime_namespace}"
   helm_get "${fluid_name}"
-  helm_get "${runtime_name}"
+  helm_get_runtime "${runtime_name}"
   pod_status "${fluid_namespace}"
   pod_status "${runtime_namespace}"
   runtime_pod_logs

diff --git a/tools/diagnose-fluid-juicefs.sh b/tools/diagnose-fluid-juicefs.sh
@@ -32,9 +32,14 @@ helm_get() {
   run helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
 }
 
+helm_get_runtime() {
+  run env HELM_DRIVER=configmap helm get all -n ${runtime_namespace} "${1}" &>"$diagnose_dir/helm-${1}.yaml"
+}
+
 pod_status() {
   local namespace=${1:-"default"}
   run kubectl get po -owide -n ${namespace} &>"$diagnose_dir/pods-${namespace}.log"
+  run kubectl get po -oyaml -n ${namespace} &>>"$diagnose_dir/pods-${namespace}.log"
 }
 
 fluid_pod_logs() {
@@ -89,7 +94,7 @@ archive() {
 pd_collect() {
   echo "Start collecting, runtime-name=${runtime_name}, runtime-namespace=${runtime_namespace}"
   helm_get "${fluid_name}"
-  helm_get "${runtime_name}"
+  helm_get_runtime "${runtime_name}"
   pod_status "${fluid_namespace}"
   pod_status "${runtime_namespace}"
   runtime_pod_logs