8000 fix injection template for ClusterTrustBundle by zirain · Pull Request #56676 · istio/istio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix injection template for ClusterTrustBundle #56676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 18, 2025
Merged

fix injection template for ClusterTrustBundle #56676

merged 1 commit into from
Jun 18, 2025

Conversation

zirain
Copy link
Member
@zirain zirain commented Jun 18, 2025 •
edited by istio-policy-bot
Loading

Please provide a description of this PR:

Follow up: #55592

@zirain zirain requested a review from a team as a code owner June 18, 2025 03:34
@istio-policy-bot istio-policy-bot added area/environments release-notes-none Indicates a PR that does not require release notes. labels Jun 18, 2025
@zirain
Copy link
Member Author
zirain commented Jun 18, 2025

cc @dgn

@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 18, 2025
eliaanna
eliaanna reviewed Jun 18, 2025
View reviewed changes
Copy link
@eliaanna eliaanna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1

@istio-testing istio-testing merged commit 45f1362 into istio:master Jun 18, 2025
30 checks passed
@zirain zirain deleted the fix-injection-template branch June 18, 2025 07:50
@zirain
Copy link
Member Author
zirain commented Jun 23, 2025

/cherrypick release-1.26

@istio-testing
Copy link
Collaborator

@zirain: #56676 failed to apply on top of branch "release-1.26":

Applying: fix clusterTrustBundle template
Using index info to reconstruct a base tree...
M	manifests/charts/istio-control/istio-discovery/files/gateway-injection-template.yaml
M	manifests/charts/istio-control/istio-discovery/files/grpc-agent.yaml
M	manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/injection-template.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/grpc-agent.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/grpc-agent.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/gateway-injection-template.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/gateway-injection-template.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 clusterTrustBundle template

In response to this:

/cherrypick release-1.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@istio-testing
Copy link
Collaborator

@zirain: new issue created for failed cherrypick: #56745

In response to this:

/cherrypick release-1.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@istio-testing istio-testing mentioned this pull request Jun 23, 2025
Open
zirain added a commit to zirain/istio that referenced this pull request Jun 24, 2025
@zirain
fix clusterTrustBundle template (istio#56676)
864ff87
This was referenced Jun 24, 2025
Merged
Open
istio-testing pushed a commit that referenced this pull request Jun 26, 2025
@zirain
fix clusterTrustBundle template (#56676) (#56747)
dc7badb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eliaanna eliaanna eliaanna left review comments

@dgn dgn dgn approved these changes

Assignees
No one assigned
Labels
area/environments release-notes-none Indicates a PR that does not require release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zirain @istio-testing @dgn @eliaanna @istio-policy-bot
0