Open
Description
Manual cherrypick required.
#55665 failed to apply on top of branch "release-1.23":
Applying: Fix broken IstioCNI config for enabling repair mode
Using index info to reconstruct a base tree...
M manifests/charts/istio-cni/templates/configmap-cni.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/charts/istio-cni/templates/configmap-cni.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/templates/configmap-cni.yaml
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 advice.mergeConflict false"
Patch failed at 0001 Fix broken IstioCNI config for enabling repair mode