Proxy persist proxy ports #32973
Merged
Proxy persist proxy ports #32973
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/test |
a62ba38 to
8c31a27
Compare
|
/test |
8c31a27 to
721fd19
Compare
|
/test |
pippolo84
reviewed
Jun 10, 2024
mhofstetter
reviewed
Jun 11, 2024
721fd19 to
6cb72cf
Compare
mhofstetter
reviewed
Jun 11, 2024
rgo3
approved these changes
Jun 12, 2024
Clear proxy port on failure so that we'll try another random port next time. We have two failure cases for creating new redirects: - syncronous, for DNS proxy. Simply zero the proxy port in the retry loop. - asynchronous, for Envoy proxy. Clear proxy port state on revert callback. Noticed the need for this change when accidentally trying to use port 1 for Envoy when developing another feature. In this case Envoy can't bind the port, and all further tries were also trying the same port, as the proxy port was not cleared on revert. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
"rulesPort" is non-zero when we have a datapath (iptables) rules with a specific port. Try re-creating a redirect with that port if no other port is configured. This reduces churn on the datapath, as the existing rule can be reused without a need for an update. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Rename AllocateProxyPort as AllocateCRDProxyPort to make it clear that it is only to be used for CEC/CCEC CRD listeners. Also enforce the current practice where CRD proxy ports are only accessed by name, and 'ingress' member is always false for CRD ports. Fix the unit test to verify that the proxy port was not reallocated for the same listener name. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
We now only ever have 'localOnly = true' so that we always bind the proxy listeners to localhost address. Remove support for all-hosts addresses. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Previously we only reused the DNS proxy port from the datapath. Change to reuse the old proxy ports for all proxy redirects from datapath, if possible. This reduces Listener churn on daemonset Envoy on agent restart. With this change the listener update in Envoy logs after agent restart looks like this: begin add/update listener: name=cilium-http-egress:13563 hash=11560876577076369351 duplicate/locked listener 'cilium-http-egress:13563'. no add/update lds: add/update listener 'cilium-http-egress:13563' skipped Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
6cb72cf to
f1e6866
Compare
Write proxy ports into /var/cilium/state/proxy_ports_state.json and
restore from there. If the file is not available, only then restore from
iptables rules. Restoration from iptables is still needed for upgrades.
This fixes the issue with bpf TPROXY, as it does not rely on iptables
rules, so the proxy ports can not be recovered from them.
Note: File IO is patterned after similar methods for
cache.CachingIdentityAllocator.
Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
f1e6866 to
43e9793
Compare
jibi
approved these changes
Jun 13, 2024
|
/test |
mhofstetter
approved these changes
Jun 14, 2024
1 task
1 task
This was referenced Nov 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Persist proxy ports in
/var/run/cilium/state/proxy_ports_state.jsonso that proxy ports (including the DNS proxy port) can also be restored when BPF tproxy is used. This file is written each time we would upsert a TPROXY iptables rule and restored on restart. If the file does not exist proxy ports are restored from iptables rules instead. This is needed for upgrade compatibility.Earlier commits in this series fix related issues in proxy port handling that are mainly meaningful for restoration with daemonset Envoy proxy:
trueThe last two commits introduce the main changes:
Since this mainly enhances use of daemonset Envoy proxy by reducing Listener churn on Cilium agent restarts and daemonset Envoy is enabled by default only from Cilium 1.16, there is no need to backport these changes.