@dylandreimerink Would you mind taking look at this PR? You have the most context on #34677

I have two requests that I forgot to add to the initial review. The first being, could you please add a test case. We already have one that asserts the non-overlapping ports, you should be able to copy it and modify it, set the service differentiation setting in the new case and make the two services use UDP and TCP on the same port, assert they get the same IP assigned.

My second request is to slightly change the way we plumb in the service differentiation setting. The current way uses the global variable, which may cause issues during testing since changing it persists across test cases. What I suggest instead is to use the config object that is already provided.

You can add a new boolean here for the setting and set it here

Finally, add a new boolean to the isCompatible function and plumb the config value to it via its callsites.

I hope that made sense 😅. Its a few additional lines of code, but it makes this piece of code easier to test without the global variable usage, so worth it

hi @dylandreimerink, I have improved this PR, but I didn’t use the DaemonConfig you mentioned. I’m not sure if this is correct.

/test

/test

/test

Let's see if a rebase helps to resolve the one CI fail in e2e-upgrade.

/test