Skip to content

Use nftablesMode=Auto in FelixConfiguration #4389

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.

Sign up for GitHub

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

Open
caseydavenport wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use nftablesMode=Auto in FelixConfiguration #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/apis/crd.projectcalico.org/v1/felixconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type NFTablesMode string
const (
NFTablesModeEnabled NFTablesMode = "Enabled"
NFTablesModeDisabled NFTablesMode = "Disabled"
NFTablesModeAuto NFTablesMode = "Auto"
)

type IptablesBackend string
Expand Down
22 changes: 13 additions & 9 deletions pkg/controller/installation/core_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,17 +1814,21 @@ func (r *ReconcileInstallation) setNftablesMode(_ context.Context, install *oper
// we don't need to handle upgrades from versions that were previously FelixConfiguration only - nftables mode has always
// been controlled by the operator.
if install.Spec.CalicoNetwork.LinuxDataplane != nil {
nftablesMode := crdv1.NFTablesModeDisabled
if install.Spec.IsNftables() {
// The operator is configured to use the nftables dataplane. Configure Felix to use nftables.
updated = fc.Spec.NFTablesMode == nil || *fc.Spec.NFTablesMode != crdv1.NFTablesModeEnabled
nftablesMode := crdv1.NFTablesModeEnabled
fc.Spec.NFTablesMode = &nftablesMode
} else {
// The operator is configured to use another dataplane. Disable nftables.
updated = fc.Spec.NFTablesMode == nil || *fc.Spec.NFTablesMode != crdv1.NFTablesModeDisabled
nftablesMode := crdv1.NFTablesModeDisabled
fc.Spec.NFTablesMode = &nftablesMode
// The operator is configured to use the nftables dataplane.
if install.Spec.BPFEnabled() {
// For BPF mode, we always use nftables, as we don't use the upstream kube-proxy and so don't need to
// worry about compatibility with its mode of operation.
nftablesMode = crdv1.NFTablesModeEnabled
} else {
// Otherwise, kube-proxy is running - configure Felix to auto-detect whether it should use nftables or iptables on
// a per-node basis, allowing for smoother upgrades.
nftablesMode = crdv1.NFTablesModeAuto
}
}
updated = fc.Spec.NFTablesMode == nil || *fc.Spec.NFTablesMode != nftablesMode
fc.Spec.NFTablesMode = &nftablesMode
}
if updated {
reqLogger.Info("Patching nftables mode", "nftablesMode", *fc.Spec.NFTablesMode)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/installation/core_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ var _ = Describe("Testing core-controller installation", func() {
err = c.Get(ctx, types.NamespacedName{Name: "default"}, fc)
Expect(err).ShouldNot(HaveOccurred())
Expect(fc.Spec.NFTablesMode).ToNot(BeNil())
Expect(*fc.Spec.NFTablesMode).To(Equal(crdv1.NFTablesModeEnabled))
Expect(*fc.Spec.NFTablesMode).To(Equal(crdv1.NFTablesModeAuto))
})

It("should set NFTablesMode to Disabled if nftables mode is changed", func() {
Expand Down
Loading