Skip to content

[release-1.26] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1881

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

Merged
istio-testing merged 2 commits into from
Apr 24, 2026
Merged

[release-1.26] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1881

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2baead
test: Modify await_operator to dinamically get deployment name from c…
fjglira Apr 23, 2026
650b9df
Get the deployment name from current .clusterserviceversion.yaml file…
fjglira Apr 23, 2026
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
15 changes: 13 additions & 2 deletions tests/e2e/common-operator-integ-suite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,19 @@ install_operator() {
}

await_operator() {
echo "Awaiting sail-operator deployment on (KUBECONFIG=${KUBECONFIG})"
"${COMMAND}" wait --for=condition=available deployment/"${DEPLOYMENT_NAME}" -n "${NAMESPACE}" --timeout=5m
echo "Awaiting operator deployment on (KUBECONFIG=${KUBECONFIG})"
local name="${DEPLOYMENT_NAME}"
if [ "${OLM}" == "true" ]; then
local csv_name
local csv_file
csv_file=$(find "${WD}/../../bundle/manifests/" -name "*.clusterserviceversion.yaml" | head -1)
csv_name=$(yq eval '.spec.install.spec.deployments[0].name' "${csv_file}" 2>/dev/null || true)
if [ -n "${csv_name}" ]; then
echo "OLM mode: using deployment name from bundle CSV: ${csv_name}"
name="${csv_name}"
fi
fi
"${COMMAND}" wait --for=condition=available deployment/"${name}" -n "${NAMESPACE}" --timeout=5m
}

# shellcheck disable=SC2329,SC2317 # Function is invoked indirectly via trap
Expand Down
Loading