Skip to content

Do not patch the helm values#569

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:release-3.2from
FilipB:do-not-patch-values-3-2
Oct 23, 2025
Merged

Do not patch the helm values#569
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:release-3.2from
FilipB:do-not-patch-values-3-2

Conversation

@FilipB
Copy link
Copy Markdown

@FilipB FilipB commented Oct 22, 2025

This is required after istio-ecosystem#1297

@openshift-merge-bot openshift-merge-bot bot merged commit 234ba23 into openshift-service-mesh:release-3.2 Oct 23, 2025
8 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown

In response to a cherrypick label: #569 failed to apply on top of branch "release-3.0":

Applying: Do not patch the helm values
Using index info to reconstruct a base tree...
M	Makefile.vendor.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.vendor.mk
CONFLICT (content): Merge conflict in Makefile.vendor.mk
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 Do not patch the helm values

@openshift-cherrypick-robot
Copy link
Copy Markdown

In response to a cherrypick label: #569 failed to apply on top of branch "release-3.1":

Applying: Do not patch the helm values
Using index info to reconstruct a base tree...
M	Makefile.vendor.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.vendor.mk
CONFLICT (content): Merge conflict in Makefile.vendor.mk
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 Do not patch the helm values

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants