cherry-picks from upstream on v1.15.12 for conformance test fix #24
Conversation
This file contains 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
this commit updates the service logic, from the agent all the way down to the datapath, to take into account the L4 protocols specified in a k8s service. Historically Cilium has always been ignoring, at least from a end user perspective, the protocol specified in a k8s service, resulting in the inability to expose a port only for a given protocol, or in the opposite case, resulting in a single protocol-agnostic service exposed whenever 2 TCP and UDP services on the same port were configured. Co-authored-by: Nate Sweet <[email protected]> Co-authored-by: Antonio Ojea <[email protected]> Signed-off-by: Gilberto Bertin <[email protected]>
add a new bpf-lb-proto-diff flag that disables the service protocol differentiation logic, allowing to keep the old Cilium behavior where service protocols are not distinguished Signed-off-by: Gilberto Bertin <[email protected]>
when upgrading to a version of Cilium that supports and has service protocol differentiation enabled, existing services without protocol set will be overwritten (or better, restored from the bpf maps, deleted because they are orphan and the recreated) with their protocol set. As this causes connection disruptions, keep those services without protocol until the user explicitly deletes them. To allow both type of services to co-exist, this commit: - introduces a second service lookup in the datapath, without the protocol set, in case the protocol lookup fails - updates the service allocation logic to check both for services with and without protocol before allocating a new one - updates the deletion logic to look for both with and without protocol versions, to ensure all service versions are proper deleted Co-authored-by: Antonio Ojea <[email protected]> Signed-off-by: Gilberto Bertin <[email protected]>
Signed-off-by: Gilberto Bertin <[email protected]>
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.
Instead of going through the many conflict resolutions cherry-picking the upstream commits, for this one, I used the commits cherry-picked onto the v1.15.8 from #21
Run
ARCH=amd64 DOCKER_REGISTRY=docker.io DOCKER_DEV_ACCOUNT=<docker account> DOCKER_IMAGE_TAG=v1.15.12-conformance-fix make docker-cilium-image docker-operator-generic-imageto build the image.