Skip to content

fix(weather-demo): teach pick_log_container the proxy-sidecar container name #420

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
huang195 merged 1 commit into from
May 16, 2026
Merged

fix(weather-demo): teach pick_log_container the proxy-sidecar container name #420

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
25 changes: 18 additions & 7 deletions authbridge/demos/weather-agent/deploy_and_verify_advanced.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,24 @@ pick_log_container() {
local pod=$1
local names
names=$(kubectl get pod -n "$NAMESPACE" "$pod" -o jsonpath='{.spec.containers[*].name}' | tr ' ' '\n')
if echo "$names" | grep -qx 'envoy-proxy'; then
echo envoy-proxy
elif echo "$names" | grep -qx 'authbridge'; then
echo authbridge
else
die "pod $pod has neither envoy-proxy nor authbridge container ($names)"
fi
# Container name depends on the resolved AuthBridge mode (per
# kagenti-operator/internal/webhook/injector/container_builder.go):
# proxy-sidecar (cluster default after kagenti-operator#361):
# AuthBridgeProxyContainerName = "authbridge-proxy"
# envoy-sidecar:
# EnvoyProxyContainerName = "envoy-proxy"
# The earlier `combinedSidecar` feature gate produced a bare
# "authbridge" container, but that gate (and the constant) were
# removed in #361 — and this script already requires the post-#361
# AgentRuntime CRD just above, so there's no pre-#361 path to
# support here.
for c in authbridge-proxy envoy-proxy; do

@pdettori pdettori May 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: The commit message body says the loop covers three names (authbridge-proxy / envoy-proxy / authbridge) and that "the legacy combined name is kept for older clusters / replays" — but the code only loops over two (authbridge-proxy envoy-proxy), matching the PR description's deliberate exclusion of bare authbridge. The commit message appears to be from an earlier iteration. Not blocking since the code + PR description are correct, but worth a force-push to fix if convenient.

if echo "$names" | grep -qx "$c"; then
echo "$c"
return 0
fi
done
die "pod $pod has no AuthBridge sidecar (expected one of authbridge-proxy / envoy-proxy; got: $(echo $names))"
}

TOOL_LOG_C=$(pick_log_container "$ADV_TOOL_POD")
Expand Down
Loading