Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: fix kind e2e test images #4232

Merged
merged 2 commits into from
Jul 24, 2024
Merged

bugfix: fix kind e2e test images #4232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089a9d0
Fix version replace in gha-e2e
TrafalgarZZZ Jul 24, 2024
34a3abb
Optimize diagnose shell scripts
TrafalgarZZZ Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/deploy-fluid-to-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
7 changes: 6 additions & 1 deletion tools/diagnose-fluid-alluxio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion tools/diagnose-fluid-jindo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion tools/diagnose-fluid-juicefs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
Loading