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

dns: fix search lookup #1099

Merged
merged 2 commits into from
Jun 4, 2024
Merged

dns: fix search lookup #1099

merged 2 commits into from
Jun 4, 2024

Conversation

howardjohn
Copy link
Member

Fixes #1074 (issue was incorrect
basically).

Before our search domain was always ztunnel's (istio-system). This is incorrect; we
should know the search domain of the request.

We don't know the per-pod custom settings
(#555), but we can use the
correct defaults.

@howardjohn howardjohn requested a review from a team as a code owner May 29, 2024 17:06
@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 May 29, 2024
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 29, 2024
Copy link
Contributor

@ilrudie ilrudie left a comment

Choose a reason for hiding this comment

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

looks good but probably should remove the unwraps before we merge it

src/dns/server.rs Outdated Show resolved Hide resolved
src/dns/server.rs Outdated Show resolved Hide resolved
@istio-testing istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Jun 3, 2024
Fixes istio#1074 (issue was incorrect
basically).

Before our search domain was always ztunnel's (istio-system). This is incorrect; we
should know the search domain of the request.

We don't know the per-pod custom settings
(istio#555), but we can use the
correct defaults.
@istio-testing istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Jun 3, 2024
@istio-testing istio-testing merged commit 2e41538 into istio:master Jun 4, 2024
2 of 3 checks passed
@istio-testing
Copy link
Contributor

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

Applying: dns: fix search lookup
Applying: Fix unwrap
Using index info to reconstruct a base tree...
M	src/dns/server.rs
M	src/proxyfactory.rs
Falling back to patching base and 3-way merge...
Auto-merging src/proxyfactory.rs
CONFLICT (content): Merge conflict in src/proxyfactory.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 0002 Fix unwrap
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: #1112

howardjohn added a commit to howardjohn/ztunnel that referenced this pull request Jun 6, 2024
* dns: fix search lookup

Fixes istio#1074 (issue was incorrect
basically).

Before our search domain was always ztunnel's (istio-system). This is incorrect; we
should know the search domain of the request.

We don't know the per-pod custom settings
(istio#555), but we can use the
correct defaults.

* Fix unwrap

(cherry picked from commit 2e41538)
istio-testing pushed a commit that referenced this pull request Jun 6, 2024
* dns: fix search lookup

Fixes #1074 (issue was incorrect
basically).

Before our search domain was always ztunnel's (istio-system). This is incorrect; we
should know the search domain of the request.

We don't know the per-pod custom settings
(#555), but we can use the
correct defaults.

* Fix unwrap

(cherry picked from commit 2e41538)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dns: add "autopath" mode
4 participants