Skip to content
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.

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

[release-1.22] Ambient CNI informer: K8S job pods must be handled uniquely #51687

Closed
istio-testing opened this issue Jun 24, 2024 · 0 comments
Closed
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#51429 failed to apply on top of branch "release-1.22":

Applying: Skip pods with duplicate IPs when adding to host probe exclusion set
Using index info to reconstruct a base tree...
M	cni/pkg/nodeagent/net.go
M	cni/pkg/nodeagent/net_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/nodeagent/net_test.go
Auto-merging cni/pkg/nodeagent/net.go
Applying: Lint
Applying: Relnote
Applying: Actually exclude terminated job pods
Applying: Shorten log
Applying: Derp
Applying: More robust checks
Applying: Use old pod
Applying: Test
Applying: More test
Applying: Lints
Applying: Smarter IP add
Using index info to reconstruct a base tree...
M	cni/pkg/nodeagent/net.go
M	cni/pkg/nodeagent/net_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/nodeagent/net_test.go
CONFLICT (content): Merge conflict in cni/pkg/nodeagent/net_test.go
Auto-merging cni/pkg/nodeagent/net.go
CONFLICT (content): Merge conflict in cni/pkg/nodeagent/net.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 Smarter IP add
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants