[release-1.29] Fix ambient pods dropped from host probe ipset after node/kubelet restart
Author: istio-testingCreated Jun 10, 2026Updated Sep 17, 2026
Labelslifecycle/stale
Manual cherrypick required.
#60471 failed to apply on top of branch "release-1.29":
Applying: Fix ambient pods dropped from host probe ipset after node/kubelet restart
Applying: only fire when a Pods IP changes or goes from nothing to something
Applying: added test for no ip and ip reapearing
Using index info to reconstruct a base tree...
M cni/pkg/nodeagent/informers_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/nodeagent/informers_test.go
CONFLICT (content): Merge conflict in cni/pkg/nodeagent/informers_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0003 added test for no ip and ip reapearing
Source: istio/istio