fix: Sort TCP/UDP upstream order

[mikebryant]

What this PR does / why we need it: Sorts the TCP/UDP upstream order, to reduce unnecessary config reloads

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #2721

[codecov-io]

Codecov Report

Merging #2885 into master will decrease coverage by 0.04%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #2885      +/-   ##
==========================================
- Coverage   47.56%   47.52%   -0.05%     
==========================================
  Files          76       76              
  Lines        5483     5486       +3     
==========================================
- Hits         2608     2607       -1     
- Misses       2540     2545       +5     
+ Partials      335      334       -1

Impacted Files	Coverage Δ
internal/ingress/controller/controller.go	2.21% <0%> (-0.01%)	⬇️
internal/watch/file_watcher.go	80.76% <0%> (-3.85%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 82bfcb0...8067e0b. Read the comment docs.

[mikebryant]

/assign @caseydavenport

[aledbf]

@mikebryant please don't assign PRs manually

[aledbf]

@mikebryant this only sort by port number. You should use something like https://github.com/ocadotechnology/ingress-nginx/blob/8067e0bcc3c9df090530bdc113650fceb8e86bca/internal/ingress/controller/controller.go#L806

[mikebryant]

@aledbf Apologies, I was trying to follow the instructions given by @k8s-ci-robot

[mikebryant]

@mikebryant this only sort by port number. You should use something like https://github.com/ocadotechnology/ingress-nginx/blob/8067e0bcc3c9df090530bdc113650fceb8e86bca/internal/ingress/controller/controller.go#L806

@aledbf I don't understand - the externalPort here is the key of the original configmap, so doesn't that mean there can't be duplicates? I'm trying to sort the upstreams themselves, of which there's one per port, not the backends.

[aledbf]

@mikebryant you need to sort using both fields, Address and Port

[mikebryant]

@mikebryant you need to sort using both fields, Address and Port

Looking here:
https://github.com/ocadotechnology/ingress-nginx/blob/8067e0bcc3c9df090530bdc113650fceb8e86bca/internal/ingress/controller/controller.go#L327

I don't see where there's an Address field on an ingress.L4Service type?

[mikebryant]

@aledbf Am I right in thinking you're talking about an Endpoint object? I'm not trying to sort those, I'm trying to sort the upstream definitions themselves, i.e. the order of the upstream lines in the config

[mikebryant]

Is there anything I need to be doing to help get this merged?

[aledbf]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, mikebryant

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [aledbf]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[aledbf]

@mikebryant thanks!