Skip to content

fix(e2e): detect gateway workload for Kubernetes health port-forward #2198

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

Open
elezar wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −4
Open

fix(e2e): detect gateway workload for Kubernetes health port-forward #2198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions e2e/with-kube-gateway.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,19 @@ helmctl() {
helm --kube-context "${KUBE_CONTEXT}" "$@"
}

# Return the kubectl resource reference (e.g. "sts/openshell" or "deploy/openshell")
# for the deployed gateway workload. The chart deploys a StatefulSet by default
# and a Deployment when workload.kind=deployment (external DB / HA mode).
kube_workload_ref() {
local name="$1"
local ns="${2:-${NAMESPACE}}"
if kctl -n "${ns}" get statefulset "${name}" >/dev/null 2>&1; then
echo "sts/${name}"
else
echo "deploy/${name}"
fi
}

deploy_postgres_fixture() {
local secret_name="$1"
local pg_uri
Expand Down Expand Up @@ -320,8 +333,10 @@ run_scenario() {
fi

HEALTH_LOCAL_PORT="$(e2e_pick_port)"
echo "Starting kubectl port-forward sts/${RELEASE_NAME} ${HEALTH_LOCAL_PORT}:health..."
kctl -n "${NAMESPACE}" port-forward "sts/${RELEASE_NAME}" \
local workload_ref
workload_ref="$(kube_workload_ref "${RELEASE_NAME}")"
echo "Starting kubectl port-forward ${workload_ref} ${HEALTH_LOCAL_PORT}:health..."
kctl -n "${NAMESPACE}" port-forward "${workload_ref}" \
"${HEALTH_LOCAL_PORT}:health" >"${PORTFORWARD_HEALTH_LOG}" 2>&1 &
PORTFORWARD_HEALTH_PID=$!

Expand Down Expand Up @@ -652,8 +667,9 @@ else
fi

HEALTH_LOCAL_PORT="$(e2e_pick_port)"
echo "Starting kubectl port-forward sts/${RELEASE_NAME} ${HEALTH_LOCAL_PORT}:health..."
kctl -n "${NAMESPACE}" port-forward "sts/${RELEASE_NAME}" \
WORKLOAD_REF="$(kube_workload_ref "${RELEASE_NAME}")"
echo "Starting kubectl port-forward ${WORKLOAD_REF} ${HEALTH_LOCAL_PORT}:health..."
kctl -n "${NAMESPACE}" port-forward "${WORKLOAD_REF}" \
"${HEALTH_LOCAL_PORT}:health" >"${PORTFORWARD_HEALTH_LOG}" 2>&1 &
PORTFORWARD_HEALTH_PID=$!

Expand Down
Loading