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

Update Calico config for eBPF mode #10115

Merged
merged 4 commits into from
Oct 27, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Oct 27, 2020

Based on discussion with @fasaxc in Slack I changed the Calico manifest to use an optional ConfigMap to set the k8s endpoints.
Additionally I added an option for the cleanup of iptables rules (in case it's need for migration) and updated the version to 3.16.4.

/cc @seh @olemarkus

@k8s-ci-robot k8s-ci-robot added 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 27, 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. area/api labels Oct 27, 2020
@kubernetes kubernetes deleted a comment from k8s-ci-robot Oct 27, 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 27, 2020
@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 27, 2020
@k8s-ci-robot k8s-ci-robot merged commit 877e71f into kubernetes:master Oct 27, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Oct 27, 2020
@hakman hakman deleted the calico-bpf-tweaks branch October 27, 2020 10:51
k8s-ci-robot added a commit that referenced this pull request Oct 27, 2020
…-upstream-release-1.19

Automated cherry pick of #10115: Use optional ConfigMap to configure k8s API endpoint for
@seh
Copy link
Contributor

seh commented Oct 27, 2020

Thank you for this one, @hakman. Is it correct that for now, even when Calico's eBPF mode is enabled, we still run kube-proxy, or do we automatically disable those static pods when we're in that mode?

@hakman
Copy link
Member Author

hakman commented Oct 27, 2020

For now kube-proxy is always enabled unless spec.kubeProxy.enabled: false and rolling-update is done.

@seh
Copy link
Contributor

seh commented Oct 27, 2020

Do you envision ever tying these settings together in kops automatically? That is, if Calico is in eBPF mode, then the default value for "spec.kubeProxy.enabled" would become false?

@hakman
Copy link
Member Author

hakman commented Oct 27, 2020

Can't say never, but you probably understand the complications of doing this.
Cilium can coexist with kube-proxy, so there is no problem there. Not sure if Calico can do that also in the future.

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 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.

None yet

4 participants