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

Add eBPF dataplane support for Calico CNI #10069

Merged
merged 1 commit into from
Oct 19, 2020

Conversation

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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:

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

@k8s-ci-robot k8s-ci-robot added area/addons approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 19, 2020
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 19, 2020
@@ -3836,6 +3863,20 @@ spec:
name: kubernetes-services-endpoint
Copy link

Choose a reason for hiding this comment

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

You could use the kubernetes-services-endpoint config map that we now have for KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT. All the components are alrady configured to pick that up.

Copy link
Member Author

Choose a reason for hiding this comment

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

Wouldn't this require first to move to the Operator first?

Copy link
Member

Choose a reason for hiding this comment

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

Not sure you need to do this conditionally. For cilium I chose to just always do this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Because we merge logic from different manifests, it will be easier later to track why these were added.

Copy link

Choose a reason for hiding this comment

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

Wouldn't this require first to move to the Operator first?

No, we have the same config map in both install methods (but for operator it needs to be in the operator's namespace, not kube-system). If you look a few lines above you can see the config map ref in your manifest ;-)

Copy link
Member Author

Choose a reason for hiding this comment

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

Got it. Thanks! :)

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 19, 2020
@hakman hakman force-pushed the calico-bpf branch 3 times, most recently from eb0e042 to 3e67d28 Compare October 19, 2020 16:07
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/api area/documentation and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 19, 2020
@hakman hakman requested a review from olemarkus October 19, 2020 16:07
@hakman hakman changed the title [WIP] Add BPF support for Calico CNI Add eBPF dataplane support for Calico CNI Oct 19, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2020
@hakman hakman force-pushed the calico-bpf branch 2 times, most recently from ab0bef1 to 7b00239 Compare October 19, 2020 16:15
@@ -3836,6 +3863,20 @@ spec:
name: kubernetes-services-endpoint
Copy link
Member

Choose a reason for hiding this comment

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

Not sure you need to do this conditionally. For cilium I chose to just always do this.

@olemarkus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit e86f511 into kubernetes:master Oct 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Oct 19, 2020
@hakman hakman deleted the calico-bpf branch October 19, 2020 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api area/documentation cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants