diff --git a/go.mod b/go.mod index 543bc6b8a..8a828af86 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - github.com/tigera/operator v1.35.0 + github.com/tigera/operator v1.36.0 github.com/vishvananda/netlink v1.2.1-beta.2.0.20230130171208-05506ada9f99 go.uber.org/zap v1.27.0 golang.org/x/sys v0.25.0 diff --git a/go.sum b/go.sum index d7cdb3833..97cf1e0ad 100644 --- a/go.sum +++ b/go.sum @@ -511,8 +511,8 @@ github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tigera/api v0.0.0-20230406222214-ca74195900cb h1:Y7r5Al3V235KaEoAzGBz9RYXEbwDu8CPaZoCq2PlD8w= github.com/tigera/api v0.0.0-20230406222214-ca74195900cb/go.mod h1:ZZghiX3CUsBAc0osBjRvV6y/eun2ObYdvSbjqXAoj/w= -github.com/tigera/operator v1.35.0 h1:lATfc5r2EQCPiuh8tDD9Vd2tvWAwXt+S4LS/mycVyCM= -github.com/tigera/operator v1.35.0/go.mod h1:gqCRZUAJpvbMJYNkvtNMhqR8I7Xi2lgPFI7MzrRJqTU= +github.com/tigera/operator v1.36.0 h1:d0+1pbZsGXfp3zSmR/SQxIagEjm4wszo5/mUo0/tGto= +github.com/tigera/operator v1.36.0/go.mod h1:oiZ7qwlvN9BZLZfVagxjJ3a5lRf5LgYQnoH0f5skU1c= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= github.com/vishvananda/netlink v1.2.1-beta.2.0.20230130171208-05506ada9f99 h1:FUmcbl0T7ugzsjfmWBKmIM1c4UPOMygAEpmwGKKdAp8= diff --git a/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/felixconfig.go b/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/felixconfig.go index 0d35a0563..fd94a3746 100644 --- a/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/felixconfig.go +++ b/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/felixconfig.go @@ -20,6 +20,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +type NFTablesMode string + +const ( + NFTablesModeEnabled NFTablesMode = "Enabled" + NFTablesModeDisabled NFTablesMode = "Disabled" +) + type IptablesBackend string const ( @@ -304,6 +311,9 @@ type FelixConfigurationSpec struct { // iptables. [Default: false] GenericXDPEnabled *bool `json:"genericXDPEnabled,omitempty" confignamev1:"GenericXDPEnabled"` + // NFTablesMode configures nftables support in Felix. [Default: Disabled] + NFTablesMode *NFTablesMode `json:"nftablesMode,omitempty"` + // BPFEnabled, if enabled Felix will use the BPF dataplane. [Default: false] BPFEnabled *bool `json:"bpfEnabled,omitempty" validate:"omitempty"` // BPFDisableUnprivileged, if enabled, Felix sets the kernel.unprivileged_bpf_disabled sysctl to disable diff --git a/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/zz_generated.deepcopy.go b/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/zz_generated.deepcopy.go index 36b1abc61..c224263ca 100644 --- a/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1/zz_generated.deepcopy.go @@ -593,6 +593,11 @@ func (in *FelixConfigurationSpec) DeepCopyInto(out *FelixConfigurationSpec) { *out = new(bool) **out = **in } + if in.NFTablesMode != nil { + in, out := &in.NFTablesMode, &out.NFTablesMode + *out = new(NFTablesMode) + **out = **in + } if in.BPFEnabled != nil { in, out := &in.BPFEnabled, &out.BPFEnabled *out = new(bool) diff --git a/vendor/modules.txt b/vendor/modules.txt index bcf5632aa..175a077b8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -417,7 +417,7 @@ github.com/subosito/gotenv # github.com/tigera/api v0.0.0-20230406222214-ca74195900cb ## explicit; go 1.18 github.com/tigera/api/pkg/lib/numorstring -# github.com/tigera/operator v1.35.0 +# github.com/tigera/operator v1.36.0 ## explicit; go 1.22.0 github.com/tigera/operator/pkg/apis/crd.projectcalico.org/v1 # github.com/toqueteos/webbrowser v1.2.0