Address the review on the per-node network diagnostics. Instead of a
divergent second copy of the CNI capture logic in cozyreport.sh, add a
--baseline mode to hack/e2e-capture-dataplane.sh that cozyreport.sh
invokes, so the namespaces, DaemonSet selectors, container names and the
conntrack CLI->/proc fallback have a single source of truth shared with
the failure-triggered capture.
- replace the hubble capture (hubble.enabled is false on cozystack, so
the socket is never created and it can never produce output) with
cilium-dbg monitor --type drop, which needs no Hubble;
- carry the /proc/net/nf_conntrack fallback for images without the
conntrack CLI;
- keep records of failed captures: prune only empty files and this
script's own DIAG-SKIP absence markers, never a real kubectl exec
error, so a broken capture stays distinguishable from an absent tool;
- bound the whole capture with an aggregate timeout -k at the call site
so a wedged API server cannot cost the entire cozyreport artefact;
- unit-test the pruning predicate in hack/capture-dataplane.bats.
Signed-off-by: IvanHunters <xorokhotnikov@gmail.com>
IvanHunters
1f6bc1be37