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

Drop improper workload DNS lookups #1120

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Drop improper workload DNS lookups #1120

merged 1 commit into from
Jun 7, 2024

Conversation

howardjohn
Copy link
Member

Part 1 of #1119. This removes the
broken stuff. TODO is to add it back properly, but for now this PR
strictly removes broken code.

@howardjohn howardjohn requested a review from a team as a code owner June 6, 2024 22:55
@howardjohn howardjohn added release-notes-none Indicates a PR that does not require release notes. cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch labels Jun 6, 2024
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 6, 2024
@howardjohn
Drop improper workload DNS lookups
74e6ceb 
Part 1 of istio#1119. This removes the
broken stuff. TODO is to add it back properly, but for now this PR
strictly removes broken code.
bleggett
bleggett approved these changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@bleggett bleggett left a comment

Choose a reason for hiding this comment

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

I don't know of any uses of this stuff off the top of my head, so no issues with removing it.

@istio-testing istio-testing merged commit fac3e11 into istio:master Jun 7, 2024
3 checks passed
@istio-testing
Copy link
Contributor

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

Applying: Drop improper workload DNS lookups
Using index info to reconstruct a base tree...
M	src/dns/server.rs
M	src/state.rs
M	src/state/workload.rs
Falling back to patching base and 3-way merge...
Auto-merging src/state/workload.rs
CONFLICT (content): Merge conflict in src/state/workload.rs
Auto-merging src/state.rs
Auto-merging src/dns/server.rs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Drop improper workload DNS lookups
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: #1122

@istio-testing istio-testing mentioned this pull request Jun 7, 2024
Closed
howardjohn added a commit to howardjohn/ztunnel that referenced this pull request Jun 7, 2024
@howardjohn
Drop improper workload DNS lookups (istio#1120)
4f2fd7f 
Part 1 of istio#1119. This removes the
broken stuff. TODO is to add it back properly, but for now this PR
strictly removes broken code.

(cherry picked from commit fac3e11)
istio-testing pushed a commit that referenced this pull request Jun 11, 2024
@howardjohn
Drop improper workload DNS lookups (#1120) (#1123)
498b27c 
Part 1 of #1119. This removes the
broken stuff. TODO is to add it back properly, but for now this PR
strictly removes broken code.

(cherry picked from commit fac3e11)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bleggett bleggett bleggett approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch release-notes-none Indicates a PR that does not require release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@howardjohn @istio-testing @bleggett