[release-1.28] Prevent merging cross-namespace Istio gateways with managed GatewayAP…
Author: istio-testingCreated Jun 23, 2026Updated Sep 30, 2026
Labelslifecycle/stale
Manual cherrypick required.
#59825 failed to apply on top of branch "release-1.28":
Applying: Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways
Using index info to reconstruct a base tree...
M manifests/charts/base/files/profile-compatibility-version-1.25.yaml
M manifests/charts/base/files/profile-compatibility-version-1.26.yaml
M manifests/charts/base/files/profile-compatibility-version-1.27.yaml
A manifests/charts/base/files/profile-compatibility-version-1.28.yaml
A manifests/charts/base/files/profile-compatibility-version-1.29.yaml
M manifests/charts/default/files/profile-compatibility-version-1.25.yaml
M manifests/charts/default/files/profile-compatibility-version-1.26.yaml
M manifests/charts/default/files/profile-compatibility-version-1.27.yaml
A manifests/charts/default/files/profile-compatibility-version-1.28.yaml
A manifests/charts/default/files/profile-compatibility-version-1.29.yaml
M manifests/charts/gateway/files/profile-compatibility-version-1.25.yaml
M manifests/charts/gateway/files/profile-compatibility-version-1.26.yaml
M manifests/charts/gateway/files/profile-compatibility-version-1.27.yaml
A manifests/charts/gateway/files/profile-compatibility-version-1.28.yaml
A manifests/charts/gateway/files/profile-compatibility-version-1.29.yaml
M manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.25.yaml
M manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.26.yaml
M manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.27.yaml
A manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.28.yaml
A manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.29.yaml
M manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.25.yaml
M manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.26.yaml
M manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.27.yaml
A manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.28.yaml
A manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.29.yaml
M manifests/charts/istio-cni/files/profile-compatibility-version-1.25.yaml
M manifests/charts/istio-cni/files/profile-compatibility-version-1.26.yaml
M manifests/charts/istio-cni/files/profile-compatibility-version-1.27.yaml
A manifests/charts/istio-cni/files/profile-compatibility-version-1.28.yaml
A manifests/charts/istio-cni/files/profile-compatibility-version-1.29.yaml
M manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.25.yaml
M manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.26.yaml
M manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.27.yaml
A manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.28.yaml
A manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.29.yaml
M manifests/charts/ztunnel/files/profile-compatibility-version-1.25.yaml
M manifests/charts/ztunnel/files/profile-compatibility-version-1.26.yaml
M manifests/charts/ztunnel/files/profile-compatibility-version-1.27.yaml
A manifests/charts/ztunnel/files/profile-compatibility-version-1.28.yaml
A manifests/charts/ztunnel/files/profile-compatibility-version-1.29.yaml
M manifests/helm-profiles/compatibility-version-1.25.yaml
M manifests/helm-profiles/compatibility-version-1.26.yaml
M manifests/helm-profiles/compatibility-version-1.27.yaml
A manifests/helm-profiles/compatibility-version-1.28.yaml
A manifests/helm-profiles/compatibility-version-1.29.yaml
M pilot/pkg/features/pilot.go
M pilot/pkg/model/gateway_test.go
M pilot/pkg/model/push_context.go
Falling back to patching base and 3-way merge...
Auto-merging manifests/charts/base/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/base/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/base/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/base/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/base/files/profile-compatibility-version-1.28.yaml left in tree.
Auto-merging manifests/charts/base/files/profile-platform-k3d.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-platform-k3d.yaml
Auto-merging manifests/charts/base/files/profile-platform-minikube.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-platform-minikube.yaml
Auto-merging manifests/charts/default/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/default/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/default/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/default/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/default/files/profile-compatibility-version-1.28.yaml left in tree.
Auto-merging manifests/charts/default/files/profile-platform-k3d.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-platform-k3d.yaml
Auto-merging manifests/charts/default/files/profile-platform-minikube.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-platform-minikube.yaml
Auto-merging manifests/charts/gateway/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateway/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/gateway/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateway/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/gateway/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateway/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/gateway/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/gateway/files/profile-compatibility-version-1.28.yaml left in tree.
Auto-merging manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/gateways/istio-egress/files/profile-compatibility-version-1.28.yaml left in tree.
Auto-merging manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.28.yaml left in tree.
CONFLICT (modify/delete): manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.29.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/gateways/istio-ingress/files/profile-compatibility-version-1.29.yaml left in tree.
Auto-merging manifests/charts/istio-cni/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/istio-cni/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/istio-cni/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/istio-cni/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/istio-cni/files/profile-compatibility-version-1.28.yaml left in tree.
CONFLICT (modify/delete): manifests/charts/istio-cni/files/profile-compatibility-version-1.29.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/istio-cni/files/profile-compatibility-version-1.29.yaml left in tree.
Auto-merging manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.28.yaml left in tree.
CONFLICT (modify/delete): manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.29.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/istio-control/istio-discovery/files/profile-compatibility-version-1.29.yaml left in tree.
Auto-merging manifests/charts/ztunnel/files/profile-compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/charts/ztunnel/files/profile-compatibility-version-1.25.yaml
Auto-merging manifests/charts/ztunnel/files/profile-compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/charts/ztunnel/files/profile-compatibility-version-1.26.yaml
Auto-merging manifests/charts/ztunnel/files/profile-compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/charts/ztunnel/files/profile-compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/charts/ztunnel/files/profile-compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/ztunnel/files/profile-compatibility-version-1.28.yaml left in tree.
CONFLICT (modify/delete): manifests/charts/ztunnel/files/profile-compatibility-version-1.29.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/charts/ztunnel/files/profile-compatibility-version-1.29.yaml left in tree.
Auto-merging manifests/helm-profiles/compatibility-version-1.25.yaml
CONFLICT (content): Merge conflict in manifests/helm-profiles/compatibility-version-1.25.yaml
Auto-merging manifests/helm-profiles/compatibility-version-1.26.yaml
CONFLICT (content): Merge conflict in manifests/helm-profiles/compatibility-version-1.26.yaml
Auto-merging manifests/helm-profiles/compatibility-version-1.27.yaml
CONFLICT (content): Merge conflict in manifests/helm-profiles/compatibility-version-1.27.yaml
CONFLICT (modify/delete): manifests/helm-profiles/compatibility-version-1.28.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/helm-profiles/compatibility-version-1.28.yaml left in tree.
CONFLICT (modify/delete): manifests/helm-profiles/compatibility-version-1.29.yaml deleted in HEAD and modified in Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways. Version Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways of manifests/helm-profiles/compatibility-version-1.29.yaml left in tree.
Auto-merging pilot/pkg/features/pilot.go
Auto-merging pilot/pkg/model/gateway_test.go
Auto-merging pilot/pkg/model/push_context.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 0001 Prevent merging cross-namespace Istio gateways with managed GatewayAPI gateways
Source: istio/istio