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

[v1.14] Fix minor bug where the previous Cilium proxy port was not reused #28127

Merged
merged 3 commits into from Sep 13, 2023

Conversation

christarazi
Copy link
Member

@christarazi christarazi commented Sep 12, 2023

Once this PR is merged, you can update the PR labels via:

for pr in 27634; do contrib/backporting/set-labels.py $pr done 1.14; done

or with

make add-labels BRANCH=v1.14 ISSUES=27634

[ upstream commit b0e63b7 ]

In the upcoming commits, the DNS proxy code and the datapath iptables
code need to share a few variables. This commit is necessary to prevent
an import cycle.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit f1913e3 ]

This will be useful for the upcoming commit to use in the datapath /
iptables packages for extracting shared state from iptables rules
related to the DNS proxy.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 1f8e015 ]

In a previous change [1], the bind address for the proxy changed from
0.0.0.0 to localhost. This broke restoring the old proxy port and caused
Cilium to always allocate a new proxy port.

Fix it by changing the regex string to include the new bind address as
well as the previously used "0.0.0.0" and "::", for
backwards-compatibility reasons on upgrade.

Found by code inspection.

[1]: #25309

Fixes: 5304088 ("dnsproxy: bind dns proxy to localhost only")
Fixes: #25309

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Sep 12, 2023
@christarazi christarazi changed the title pr/christarazi/v1.14 backport 27634 [v1.14] Fix minor bug where the previous Cilium proxy port was not reused Sep 12, 2023
@christarazi
Copy link
Member Author

/test-backport-1.14

@christarazi christarazi marked this pull request as ready for review September 12, 2023 20:16
@christarazi christarazi requested a review from a team as a code owner September 12, 2023 20:16
Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

:rubber-stamp:

Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @christarazi

@christarazi christarazi merged commit f78d3dd into v1.14 Sep 13, 2023
190 checks passed
@christarazi christarazi deleted the pr/christarazi/v1.14-backport-27634 branch September 13, 2023 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants