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.

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

Add more detail to the EKS workaround #15785

Merged
merged 7 commits into from
Oct 11, 2024
Merged

Add more detail to the EKS workaround #15785

merged 7 commits into from
Oct 11, 2024

Conversation

bleggett
Copy link
Contributor

Description

Narrowed down the conditions under which this is actually required, a bit.

Reviewers

  • Ambient
  • Docs
  • Installation
  • Networking
  • Performance and Scalability
  • Extensions and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure
  • Localization/Translation

@bleggett bleggett requested a review from a team as a code owner October 10, 2024 22:59
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 10, 2024
@bleggett
Fixup
e3a47bd 
Signed-off-by: Benjamin Leggett <[email protected]>
@bleggett
Fixup more
be46ae3 
Signed-off-by: Benjamin Leggett <[email protected]>
@bleggett bleggett mentioned this pull request Oct 11, 2024
Open
2 tasks
@bleggett bleggett requested a review from craigbox October 11, 2024 16:47
@bleggett bleggett requested a review from dhawton October 11, 2024 19:03
@dhawton dhawton added the cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch label Oct 11, 2024
@istio-testing istio-testing merged commit 28f320c into istio:master Oct 11, 2024
6 checks passed
@istio-testing
Copy link
Contributor

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

Applying: Add more detail to the EKS workaround
Using index info to reconstruct a base tree...
M	content/en/docs/ambient/install/platform-prerequisites/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/ambient/install/platform-prerequisites/index.md
CONFLICT (content): Merge conflict in content/en/docs/ambient/install/platform-prerequisites/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 Add more detail to the EKS workaround
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
Copy link
Contributor

In response to a cherrypick label: new issue created for failed cherrypick: #15790

@istio-testing istio-testing mentioned this pull request Oct 11, 2024
Open
wilsonwu added a commit to wilsonwu/istio.io that referenced this pull request Oct 12, 2024
@wilsonwu
Sync istio#15785 add more detail to the EKS workaround into Chinese
858432d
@wilsonwu wilsonwu mentioned this pull request Oct 12, 2024
Merged
11 tasks
istio-testing pushed a commit that referenced this pull request Oct 12, 2024
@wilsonwu
Sync #15785 add more detail to the EKS workaround into Chinese (#15791)
7fd2967
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhawton dhawton dhawton approved these changes

@craigbox craigbox Awaiting requested review from craigbox

Assignees
No one assigned
Labels
area/ambient cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch kind/docs 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
@bleggett @istio-testing @craigbox @dhawton @istio-policy-bot