You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by hg...@apache.org on 2026/06/16 11:56:00 UTC
(iggy) branch master updated: feat: replace ingress-nginx smoke cluster with Gateway API and Envoy Gateway (#3386)
This is an automated email from the ASF dual-hosted git repository.
hubcio pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/master by this push:
new 988194d55 feat: replace ingress-nginx smoke cluster with Gateway API and Envoy Gateway (#3386)
988194d55 is described below
commit 988194d558bb1029fc8378c7a256644fc6c8c1f8
Author: Aviraj Khare <49...@users.noreply.github.com>
AuthorDate: Tue Jun 16 17:25:56 2026 +0530
feat: replace ingress-nginx smoke cluster with Gateway API and Envoy Gateway (#3386)
---
.github/config/components.yml | 2 +
scripts/ci/setup-helm-smoke-cluster.sh | 216 ++++++++++++++-------------------
scripts/ci/test-helm.sh | 182 ++++++++++++++++++++++-----
3 files changed, 241 insertions(+), 159 deletions(-)
diff --git a/.github/config/components.yml b/.github/config/components.yml
index 3e2ca285e..79b11a255 100644
--- a/.github/config/components.yml
+++ b/.github/config/components.yml
@@ -460,6 +460,8 @@ components:
helm:
paths:
- "helm/**"
+ - "scripts/ci/setup-helm-smoke-cluster.sh"
+ - "scripts/ci/test-helm.sh"
tasks: ["validate", "smoke"]
rust-bench-dashboard:
diff --git a/scripts/ci/setup-helm-smoke-cluster.sh b/scripts/ci/setup-helm-smoke-cluster.sh
index 42657400a..b73028a9e 100755
--- a/scripts/ci/setup-helm-smoke-cluster.sh
+++ b/scripts/ci/setup-helm-smoke-cluster.sh
@@ -23,15 +23,23 @@ usage() {
Usage: scripts/ci/setup-helm-smoke-cluster.sh
Create or reuse the kind cluster used by the Helm smoke test and ensure
-ingress-nginx is installed and ready in that cluster.
+the Gateway API CRDs and Envoy Gateway are installed and ready.
Environment:
- HELM_SMOKE_KIND_NAME kind cluster name (default: iggy-helm-smoke)
- HELM_SMOKE_KIND_IMAGE kind node image (default: kindest/node:v1.35.0)
- HELM_SMOKE_KIND_PLATFORM docker platform for the kind node image
- HELM_SMOKE_KIND_WAIT kind create wait timeout (default: 120s)
- HELM_SMOKE_INGRESS_NGINX_VERSION ingress-nginx controller tag (default: controller-v1.15.1)
- HELM_SMOKE_INGRESS_NGINX_TIMEOUT rollout timeout (default: 5m)
+ HELM_SMOKE_KIND_NAME kind cluster name (default: iggy-helm-smoke)
+ HELM_SMOKE_KIND_IMAGE kind node image (default: kindest/node:v1.35.0)
+ HELM_SMOKE_KIND_PLATFORM docker platform for the kind node image
+ HELM_SMOKE_KIND_WAIT kind create wait timeout (default: 120s)
+ HELM_SMOKE_GATEWAY_API_VERSION Gateway API CRD release tag (default: v1.5.1)
+ HELM_SMOKE_ENVOY_GATEWAY_VERSION Envoy Gateway Helm chart version (default: v1.8.1)
+ HELM_SMOKE_GATEWAY_TIMEOUT gateway readiness timeout (default: 5m)
+ HELM_SMOKE_GATEWAY_NAMESPACE namespace for Envoy Gateway and the Gateway resource (default: envoy-gateway-system)
+ HELM_SMOKE_GATEWAY_NAME name of the Gateway resource (default: iggy-smoke-gateway)
+
+HELM_SMOKE_GATEWAY_NAMESPACE and HELM_SMOKE_GATEWAY_NAME must match the
+values used by scripts/ci/test-helm.sh, since the HTTPRoute parentRef there
+targets this Gateway by namespace + name. Overriding one without the other
+silently breaks route attach.
EOF
}
@@ -49,8 +57,11 @@ HELM_SMOKE_KIND_NAME="${HELM_SMOKE_KIND_NAME:-iggy-helm-smoke}"
HELM_SMOKE_KIND_IMAGE="${HELM_SMOKE_KIND_IMAGE:-kindest/node:v1.35.0}"
HELM_SMOKE_KIND_PLATFORM="${HELM_SMOKE_KIND_PLATFORM:-}"
HELM_SMOKE_KIND_WAIT="${HELM_SMOKE_KIND_WAIT:-120s}"
-HELM_SMOKE_INGRESS_NGINX_VERSION="${HELM_SMOKE_INGRESS_NGINX_VERSION:-controller-v1.15.1}"
-HELM_SMOKE_INGRESS_NGINX_TIMEOUT="${HELM_SMOKE_INGRESS_NGINX_TIMEOUT:-5m}"
+HELM_SMOKE_GATEWAY_API_VERSION="${HELM_SMOKE_GATEWAY_API_VERSION:-v1.5.1}"
+HELM_SMOKE_ENVOY_GATEWAY_VERSION="${HELM_SMOKE_ENVOY_GATEWAY_VERSION:-v1.8.1}"
+HELM_SMOKE_GATEWAY_TIMEOUT="${HELM_SMOKE_GATEWAY_TIMEOUT:-5m}"
+HELM_SMOKE_GATEWAY_NAMESPACE="${HELM_SMOKE_GATEWAY_NAMESPACE:-envoy-gateway-system}"
+HELM_SMOKE_GATEWAY_NAME="${HELM_SMOKE_GATEWAY_NAME:-iggy-smoke-gateway}"
require_command() {
if ! command -v "$1" >/dev/null 2>&1; then
@@ -59,103 +70,9 @@ require_command() {
fi
}
-duration_to_seconds() {
- local duration="$1"
- local total=0
- local value
- local unit
- local multiplier
-
- if [[ "$duration" =~ ^[0-9]+$ ]]; then
- echo "$duration"
- return 0
- fi
-
- while [ -n "$duration" ]; do
- if [[ "$duration" =~ ^([0-9]+)([smhd])(.*)$ ]]; then
- value="${BASH_REMATCH[1]}"
- unit="${BASH_REMATCH[2]}"
- duration="${BASH_REMATCH[3]}"
- case "$unit" in
- s) multiplier=1 ;;
- m) multiplier=60 ;;
- h) multiplier=3600 ;;
- d) multiplier=86400 ;;
- esac
- total=$((total + (value * multiplier)))
- continue
- fi
-
- echo "Error: unsupported timeout format '$1'" >&2
- echo "Use plain seconds or a combination of s, m, h, or d units such as 300, 5m, or 1h30m." >&2
- return 1
- done
-
- echo "$total"
-}
-
-wait_for_completed_job() {
- local job_name="$1"
-
- if ! kubectl -n ingress-nginx get "job/${job_name}" >/dev/null 2>&1; then
- return 0
- fi
-
- kubectl -n ingress-nginx wait \
- --for=condition=complete \
- "job/${job_name}" \
- --timeout="$HELM_SMOKE_INGRESS_NGINX_TIMEOUT"
-}
-
-wait_for_ingress_validation() {
- local sleep_seconds=4
- local validation_timeout_seconds
- local deadline
- local probe_file
-
- validation_timeout_seconds="$(duration_to_seconds "$HELM_SMOKE_INGRESS_NGINX_TIMEOUT")"
- deadline=$((SECONDS + validation_timeout_seconds))
- probe_file="$(mktemp "${TMPDIR:-/tmp}/ingress-nginx-probe.XXXXXX.yaml")"
-
- cat > "$probe_file" <<'EOF'
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: ingress-nginx-readiness-probe
- namespace: ingress-nginx
-spec:
- ingressClassName: nginx
- rules:
- - host: readiness-probe.iggy.local
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: ingress-nginx-controller
- port:
- number: 80
-EOF
-
- while (( SECONDS < deadline )); do
- if kubectl apply --dry-run=server -f "$probe_file" >/dev/null 2>&1; then
- rm -f "$probe_file"
- return 0
- fi
- sleep "$sleep_seconds"
- done
-
- echo "Error: ingress-nginx admission webhook did not become ready within ${HELM_SMOKE_INGRESS_NGINX_TIMEOUT}" >&2
- if ! kubectl apply --dry-run=server -f "$probe_file"; then
- rm -f "$probe_file"
- return 1
- fi
- rm -f "$probe_file"
-}
-
require_command kind
require_command kubectl
+require_command helm
if [ -n "$HELM_SMOKE_KIND_PLATFORM" ]; then
require_command docker
@@ -170,19 +87,6 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- kubeadmConfigPatches:
- - |
- kind: InitConfiguration
- nodeRegistration:
- kubeletExtraArgs:
- node-labels: "ingress-ready=true"
- extraPortMappings:
- - containerPort: 80
- hostPort: 80
- protocol: TCP
- - containerPort: 443
- hostPort: 443
- protocol: TCP
EOF
cluster_exists=false
@@ -221,13 +125,71 @@ else
fi
kubectl config use-context "$kind_context" >/dev/null
-kubectl apply -f "https://raw.githubusercontent.com/kubernetes/ingress-nginx/${HELM_SMOKE_INGRESS_NGINX_VERSION}/deploy/static/provider/kind/deploy.yaml"
-kubectl -n ingress-nginx rollout status deployment/ingress-nginx-controller --timeout="$HELM_SMOKE_INGRESS_NGINX_TIMEOUT"
-kubectl -n ingress-nginx wait \
- --for=condition=ready \
- pod \
- --selector=app.kubernetes.io/component=controller \
- --timeout="$HELM_SMOKE_INGRESS_NGINX_TIMEOUT"
-wait_for_completed_job ingress-nginx-admission-create
-wait_for_completed_job ingress-nginx-admission-patch
-wait_for_ingress_validation
+
+# Install EG first so its bundled GW API CRDs land before the v1.5 safe-upgrade VAP.
+# We then upgrade those CRDs to the pinned version via server-side apply.
+echo "Installing Envoy Gateway ${HELM_SMOKE_ENVOY_GATEWAY_VERSION}..."
+helm upgrade --install eg \
+ oci://docker.io/envoyproxy/gateway-helm \
+ --version "$HELM_SMOKE_ENVOY_GATEWAY_VERSION" \
+ --namespace "$HELM_SMOKE_GATEWAY_NAMESPACE" \
+ --create-namespace \
+ --wait \
+ --timeout "$HELM_SMOKE_GATEWAY_TIMEOUT"
+
+echo "Upgrading Gateway API CRDs to ${HELM_SMOKE_GATEWAY_API_VERSION}..."
+kubectl apply --server-side --force-conflicts \
+ -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/${HELM_SMOKE_GATEWAY_API_VERSION}/standard-install.yaml"
+
+echo "Creating EnvoyProxy, GatewayClass, and Gateway..."
+# Envoy Gateway's default envoyService type is LoadBalancer, which never
+# gets an address on kind (no LB controller). Pin to ClusterIP - the smoke
+# test reaches Envoy via `kubectl port-forward svc/...:80`, which tunnels
+# through the apiserver to the ClusterIP, so no node port is needed.
+kubectl apply -f - <<EOF
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: EnvoyProxy
+metadata:
+ name: iggy-smoke-proxy
+ namespace: ${HELM_SMOKE_GATEWAY_NAMESPACE}
+spec:
+ provider:
+ type: Kubernetes
+ kubernetes:
+ envoyService:
+ type: ClusterIP
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: GatewayClass
+metadata:
+ name: iggy-smoke
+spec:
+ controllerName: gateway.envoyproxy.io/gatewayclass-controller
+ parametersRef:
+ group: gateway.envoyproxy.io
+ kind: EnvoyProxy
+ name: iggy-smoke-proxy
+ namespace: ${HELM_SMOKE_GATEWAY_NAMESPACE}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+ name: ${HELM_SMOKE_GATEWAY_NAME}
+ namespace: ${HELM_SMOKE_GATEWAY_NAMESPACE}
+spec:
+ gatewayClassName: iggy-smoke
+ listeners:
+ - name: http
+ protocol: HTTP
+ port: 80
+ allowedRoutes:
+ namespaces:
+ from: All
+EOF
+
+echo "Waiting for Gateway to be programmed..."
+kubectl wait \
+ --for=condition=Programmed \
+ "gateway/${HELM_SMOKE_GATEWAY_NAME}" \
+ --namespace "$HELM_SMOKE_GATEWAY_NAMESPACE" \
+ --timeout="$HELM_SMOKE_GATEWAY_TIMEOUT"
diff --git a/scripts/ci/test-helm.sh b/scripts/ci/test-helm.sh
index e99addba0..370b2f00b 100755
--- a/scripts/ci/test-helm.sh
+++ b/scripts/ci/test-helm.sh
@@ -30,7 +30,7 @@ Commands:
Notes:
- validate requires helm.
- - smoke requires helm, kubectl, and curl, plus an existing cluster and ingress controller.
+ - smoke requires helm, kubectl, and curl, plus an existing cluster with Gateway API CRDs and Envoy Gateway installed.
- pass --cleanup with smoke to remove the Helm smoke namespace after a successful run.
- cleanup-smoke requires kubectl and optionally helm.
- collect-smoke-diagnostics is best-effort and does not fail on missing resources.
@@ -48,10 +48,17 @@ HELM_SMOKE_REPORT_DIR="${HELM_SMOKE_REPORT_DIR:-reports/helm-smoke}"
HELM_SMOKE_SERVER_HOST="${HELM_SMOKE_SERVER_HOST:-server.iggy.local}"
HELM_SMOKE_UI_HOST="${HELM_SMOKE_UI_HOST:-ui.iggy.local}"
HELM_SMOKE_TIMEOUT="${HELM_SMOKE_TIMEOUT:-5m}"
-HELM_SMOKE_INGRESS_CLASS="${HELM_SMOKE_INGRESS_CLASS:-nginx}"
+HELM_SMOKE_GATEWAY_NAMESPACE="${HELM_SMOKE_GATEWAY_NAMESPACE:-envoy-gateway-system}"
+HELM_SMOKE_GATEWAY_NAME="${HELM_SMOKE_GATEWAY_NAME:-iggy-smoke-gateway}"
+HELM_SMOKE_GATEWAY_PF_PORT="${HELM_SMOKE_GATEWAY_PF_PORT:-8080}"
HELM_SMOKE_KIND_NAME="${HELM_SMOKE_KIND_NAME:-iggy-helm-smoke}"
HELM_SMOKE_SERVER_CPU_ALLOCATION="${HELM_SMOKE_SERVER_CPU_ALLOCATION:-1}"
+# HELM_SMOKE_GATEWAY_NAMESPACE and HELM_SMOKE_GATEWAY_NAME must match the
+# defaults in scripts/ci/setup-helm-smoke-cluster.sh - the HTTPRoute
+# parentRef below targets the Gateway by ns + name and overriding one
+# without the other silently breaks route attach.
+
require_command() {
if ! command -v "$1" >/dev/null 2>&1; then
echo "Error: required command '$1' not found" >&2
@@ -264,6 +271,85 @@ validate() {
validate_helm_docs
}
+# PID of the kubectl port-forward process started by smoke().
+# Stored at script scope so the EXIT trap can kill it on any code path.
+HELM_SMOKE_GW_PF_PID=""
+# Temp values file that may need cleanup if smoke() aborts mid-flight.
+HELM_SMOKE_VALUES_FILE=""
+
+cleanup_smoke_state() {
+ if [ -n "${HELM_SMOKE_GW_PF_PID:-}" ]; then
+ kill "$HELM_SMOKE_GW_PF_PID" 2>/dev/null || true
+ HELM_SMOKE_GW_PF_PID=""
+ fi
+ if [ -n "${HELM_SMOKE_VALUES_FILE:-}" ]; then
+ rm -f "$HELM_SMOKE_VALUES_FILE"
+ HELM_SMOKE_VALUES_FILE=""
+ fi
+}
+
+# Look up the Service that fronts the Envoy Gateway. Retries briefly to
+# tolerate the gap between Gateway "Programmed" and the owning Service
+# appearing - kubectl jsonpath on an empty `items` array exits non-zero,
+# so we also swallow stderr to avoid leaking "array index out of bounds".
+find_gateway_service() {
+ local svc_selector
+ local svc_name
+ local _
+
+ svc_selector="gateway.envoyproxy.io/owning-gateway-name=${HELM_SMOKE_GATEWAY_NAME},gateway.envoyproxy.io/owning-gateway-namespace=${HELM_SMOKE_GATEWAY_NAMESPACE}"
+
+ for _ in $(seq 1 15); do
+ svc_name="$(kubectl get svc \
+ --namespace "$HELM_SMOKE_GATEWAY_NAMESPACE" \
+ --selector "$svc_selector" \
+ -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || true)"
+ if [ -n "$svc_name" ]; then
+ printf '%s\n' "$svc_name"
+ return 0
+ fi
+ sleep 1
+ done
+
+ echo "Error: could not find Envoy Gateway proxy service after 15 attempts" >&2
+ return 1
+}
+
+# Start kubectl port-forward in the caller's shell (not a subshell) so the
+# PID is visible to the EXIT trap. Waits up to ~45 s for the tunnel to
+# accept connections (15 iterations * (curl --max-time 2 + sleep 1)).
+# curl returns 0 on any HTTP response (even 4xx/5xx); non-zero means
+# the tunnel isn't ready yet.
+start_gateway_port_forward() {
+ local svc_name="$1"
+ local ready=false
+ local _
+
+ kubectl port-forward "svc/${svc_name}" "${HELM_SMOKE_GATEWAY_PF_PORT}:80" \
+ --namespace "$HELM_SMOKE_GATEWAY_NAMESPACE" \
+ >/dev/null 2>&1 &
+ HELM_SMOKE_GW_PF_PID=$!
+
+ for _ in $(seq 1 15); do
+ if curl -s --connect-timeout 1 --max-time 2 \
+ -o /dev/null "http://127.0.0.1:${HELM_SMOKE_GATEWAY_PF_PORT}" 2>/dev/null; then
+ ready=true
+ break
+ fi
+ if ! kill -0 "$HELM_SMOKE_GW_PF_PID" 2>/dev/null; then
+ echo "Error: gateway port-forward process exited unexpectedly" >&2
+ HELM_SMOKE_GW_PF_PID=""
+ return 1
+ fi
+ sleep 1
+ done
+
+ if [ "$ready" = false ]; then
+ echo "Error: gateway port-forward did not become ready within 45 s" >&2
+ return 1
+ fi
+}
+
smoke() {
local cleanup_after_success="$1"
require_command helm
@@ -275,13 +361,16 @@ smoke() {
local ui_healthz_status
local leftover_resources
local helm_status
- local smoke_values_file
+ local gateway_svc
+ local gateway_url
+
+ trap cleanup_smoke_state EXIT
mkdir -p "$HELM_SMOKE_REPORT_DIR"
if ! helm status "$HELM_SMOKE_RELEASE" -n "$HELM_SMOKE_NAMESPACE" >/dev/null 2>&1; then
leftover_resources="$(
- kubectl -n "$HELM_SMOKE_NAMESPACE" get deployment,service,ingress,secret,serviceaccount \
+ kubectl -n "$HELM_SMOKE_NAMESPACE" get deployment,service,secret,serviceaccount \
-l "app.kubernetes.io/instance=${HELM_SMOKE_RELEASE}" \
-o name 2>/dev/null || true
)"
@@ -299,18 +388,10 @@ EOF
echo "$ui_image_tag" > "$HELM_SMOKE_REPORT_DIR/ui-image-tag.txt"
- smoke_values_file="$(mktemp "${TMPDIR:-/tmp}/iggy-helm-smoke-values.XXXXXX.yaml")"
+ HELM_SMOKE_VALUES_FILE="$(mktemp "${TMPDIR:-/tmp}/iggy-helm-smoke-values.XXXXXX.yaml")"
- cat > "$smoke_values_file" <<EOF
+ cat > "$HELM_SMOKE_VALUES_FILE" <<EOF
server:
- ingress:
- enabled: true
- className: ${HELM_SMOKE_INGRESS_CLASS}
- hosts:
- - host: ${HELM_SMOKE_SERVER_HOST}
- paths:
- - path: /
- pathType: Prefix
env:
- name: RUST_LOG
value: info
@@ -325,14 +406,6 @@ server:
- name: IGGY_SYSTEM_SHARDING_CPU_ALLOCATION
value: "${HELM_SMOKE_SERVER_CPU_ALLOCATION}"
ui:
- ingress:
- enabled: true
- className: ${HELM_SMOKE_INGRESS_CLASS}
- hosts:
- - host: ${HELM_SMOKE_UI_HOST}
- paths:
- - path: /
- pathType: Prefix
image:
tag: "${ui_image_tag}"
EOF
@@ -344,28 +417,73 @@ EOF
--create-namespace \
--wait \
--timeout "$HELM_SMOKE_TIMEOUT" \
- -f "$smoke_values_file"; then
+ -f "$HELM_SMOKE_VALUES_FILE"; then
helm_status=0
else
helm_status=$?
fi
- rm -f "$smoke_values_file"
+ rm -f "$HELM_SMOKE_VALUES_FILE"
+ HELM_SMOKE_VALUES_FILE=""
if [ "$helm_status" -ne 0 ]; then
return "$helm_status"
fi
+ kubectl apply -f - <<EOF
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+ name: iggy-server
+ namespace: ${HELM_SMOKE_NAMESPACE}
+spec:
+ parentRefs:
+ - name: ${HELM_SMOKE_GATEWAY_NAME}
+ namespace: ${HELM_SMOKE_GATEWAY_NAMESPACE}
+ hostnames:
+ - "${HELM_SMOKE_SERVER_HOST}"
+ rules:
+ - matches:
+ - path:
+ type: PathPrefix
+ value: /
+ backendRefs:
+ - name: ${HELM_SMOKE_RELEASE}
+ port: 3000
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+ name: iggy-ui
+ namespace: ${HELM_SMOKE_NAMESPACE}
+spec:
+ parentRefs:
+ - name: ${HELM_SMOKE_GATEWAY_NAME}
+ namespace: ${HELM_SMOKE_GATEWAY_NAMESPACE}
+ hostnames:
+ - "${HELM_SMOKE_UI_HOST}"
+ rules:
+ - matches:
+ - path:
+ type: PathPrefix
+ value: /
+ backendRefs:
+ - name: ${HELM_SMOKE_RELEASE}-ui
+ port: 3050
+EOF
+
+ gateway_svc="$(find_gateway_service)"
+ start_gateway_port_forward "$gateway_svc"
+ gateway_url="http://127.0.0.1:${HELM_SMOKE_GATEWAY_PF_PORT}"
+
kubectl version --client=true > "$HELM_SMOKE_REPORT_DIR/kubectl-version.txt"
- kubectl -n "$HELM_SMOKE_NAMESPACE" rollout status "deployment/$HELM_SMOKE_RELEASE" --timeout="$HELM_SMOKE_TIMEOUT"
- kubectl -n "$HELM_SMOKE_NAMESPACE" rollout status "deployment/${HELM_SMOKE_RELEASE}-ui" --timeout="$HELM_SMOKE_TIMEOUT"
- kubectl -n "$HELM_SMOKE_NAMESPACE" get pods,svc,ingress > "$HELM_SMOKE_REPORT_DIR/resources.txt"
+ kubectl -n "$HELM_SMOKE_NAMESPACE" get pods,svc,httproutes > "$HELM_SMOKE_REPORT_DIR/resources.txt"
for _ in $(seq 1 30); do
server_ping_status="$(
curl -sS -o "$HELM_SMOKE_REPORT_DIR/ping.txt" -w '%{http_code}' \
-H "Host: ${HELM_SMOKE_SERVER_HOST}" \
- http://127.0.0.1/ping || true
+ "${gateway_url}/ping" || true
)"
if [ "$server_ping_status" = "200" ] && grep -qx 'pong' "$HELM_SMOKE_REPORT_DIR/ping.txt"; then
break
@@ -380,7 +498,7 @@ EOF
ui_healthz_status="$(
curl -sS -o "$HELM_SMOKE_REPORT_DIR/ui-healthz.txt" -w '%{http_code}' \
-H "Host: ${HELM_SMOKE_UI_HOST}" \
- http://127.0.0.1/healthz || true
+ "${gateway_url}/healthz" || true
)"
if [ "$ui_healthz_status" = "200" ]; then
break
@@ -412,15 +530,15 @@ collect_smoke_diagnostics() {
helm list -A > "$HELM_SMOKE_REPORT_DIR/helm-list.txt" 2>&1 || true
kubectl get namespaces > "$HELM_SMOKE_REPORT_DIR/namespaces.txt" 2>&1 || true
- kubectl -n ingress-nginx get all > "$HELM_SMOKE_REPORT_DIR/ingress-nginx.txt" 2>&1 || true
+ kubectl -n "$HELM_SMOKE_GATEWAY_NAMESPACE" get all > "$HELM_SMOKE_REPORT_DIR/envoy-gateway.txt" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" get all > "$HELM_SMOKE_REPORT_DIR/get-all.txt" 2>&1 || true
- kubectl -n "$HELM_SMOKE_NAMESPACE" get ingress > "$HELM_SMOKE_REPORT_DIR/ingresses.txt" 2>&1 || true
+ kubectl -n "$HELM_SMOKE_NAMESPACE" get httproutes > "$HELM_SMOKE_REPORT_DIR/httproutes.txt" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" describe "deployment/$HELM_SMOKE_RELEASE" > "$HELM_SMOKE_REPORT_DIR/describe-deployment.txt" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" describe "deployment/${HELM_SMOKE_RELEASE}-ui" > "$HELM_SMOKE_REPORT_DIR/describe-ui-deployment.txt" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" describe pods > "$HELM_SMOKE_REPORT_DIR/describe-pods.txt" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" logs "deployment/$HELM_SMOKE_RELEASE" --all-containers=true > "$HELM_SMOKE_REPORT_DIR/server.log" 2>&1 || true
kubectl -n "$HELM_SMOKE_NAMESPACE" logs "deployment/${HELM_SMOKE_RELEASE}-ui" --all-containers=true > "$HELM_SMOKE_REPORT_DIR/ui.log" 2>&1 || true
- kubectl -n ingress-nginx logs deployment/ingress-nginx-controller --all-containers=true > "$HELM_SMOKE_REPORT_DIR/ingress-nginx-controller.log" 2>&1 || true
+ kubectl -n "$HELM_SMOKE_GATEWAY_NAMESPACE" logs deployment/envoy-gateway --all-containers=true > "$HELM_SMOKE_REPORT_DIR/envoy-gateway.log" 2>&1 || true
if command -v kind >/dev/null 2>&1; then
kind export logs "$HELM_SMOKE_REPORT_DIR/kind-logs" --name "$HELM_SMOKE_KIND_NAME" >/dev/null 2>&1 || true