search

maistra / istio

Apache License 2.0
93 stars 91 forks source link

OSSM-6403: Fix configuring UID/GID and iptables in TPROXY mode #991

Closed jewertow closed 5 months ago

jewertow commented 5 months ago

/retest

jewertow commented 5 months ago

/retest

jwendell commented 5 months ago

/retest

jewertow commented 5 months ago

/retest

jewertow commented 5 months ago

/retest

openshift-cherrypick-robot commented 5 months ago

In response to a cherrypick label: #991 failed to apply on top of branch "maistra-2.4":

Applying: OSSM-6403: Prevent configuring iptables rules for UID 0
Using index info to reconstruct a base tree...
M   cni/pkg/plugin/redirect.go
M   pkg/kube/inject/webhook.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/kube/inject/webhook.go
CONFLICT (content): Merge conflict in pkg/kube/inject/webhook.go
Auto-merging cni/pkg/plugin/redirect.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSSM-6403: Prevent configuring iptables rules for UID 0
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".