Open
Description
Manual cherrypick required.
#56524 failed to apply on top of branch "release-1.24":
Applying: revert istio-remote service when profil=remote
.git/rebase-apply/patch:338: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M manifests/charts/istio-control/istio-discovery/templates/clusterrole.yaml
M manifests/charts/istio-control/istio-discovery/templates/configmap.yaml
M manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
M manifests/charts/istio-control/istio-discovery/templates/remote-istiod-service.yaml
M manifests/charts/istio-control/istio-discovery/templates/service.yaml
M manifests/charts/istio-control/istio-discovery/values.yaml
M operator/cmd/mesh/manifest-generate_test.go
Falling back to patching base and 3-way merge...
Auto-merging operator/cmd/mesh/manifest-generate_test.go
Auto-merging manifests/charts/istio-control/istio-discovery/values.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/service.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/remote-istiod-service.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/templates/remote-istiod-service.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/configmap.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/templates/clusterrole.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 revert istio-remote service when profil=remote
Metadata
Metadata
Assignees
Labels
No labels