Skip to content
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.

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

[release-1.19] Aws eks setup #13859

Closed
istio-testing opened this issue Sep 12, 2023 · 1 comment · Fixed by #13860
Closed

[release-1.19] Aws eks setup #13859

istio-testing opened this issue Sep 12, 2023 · 1 comment · Fixed by #13860
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#13858 failed to apply on top of branch "release-1.19":

Applying: adding Amazon EKS with Istio setup to platform-setup page
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in content/en/docs/setup/platform-setup/amazon-eks/index.md
Auto-merging content/en/docs/setup/platform-setup/amazon-eks/index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 adding Amazon EKS with Istio setup to platform-setup page
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing istio-testing mentioned this issue Sep 12, 2023
9 tasks
@ericvn ericvn linked a pull request Sep 12, 2023 that will close this issue
@ericvn
Copy link
Contributor

ericvn commented Sep 13, 2023

Closed by #13860

@ericvn ericvn closed this as completed Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants