From b9d6bf0f6a3555b016673434b8c9c7064ae226f7 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Tue, 27 Jan 2026 14:09:33 -0800 Subject: [PATCH 1/2] Disable the Istio controller for Calico --- pkg/controller/istio/istio_controller.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/controller/istio/istio_controller.go b/pkg/controller/istio/istio_controller.go index ae03f8f89c..d5b3f171cc 100644 --- a/pkg/controller/istio/istio_controller.go +++ b/pkg/controller/istio/istio_controller.go @@ -59,6 +59,11 @@ var ( // Start Watches within the Add function for any resources that this controller creates or monitors. This will trigger // calls to Reconcile() when an instance of one of the watched resources is modified. func Add(mgr manager.Manager, opts options.AddOptions) error { + if !opts.EnterpriseCRDExists { + log.V(1).Info("Enterprise CRDs not found. Skipping Istio controller.") + return nil + } + r := newReconciler(mgr, opts) c, err := ctrlruntime.NewController("istio-controller", mgr, controller.Options{Reconciler: r}) From a028111bc3cde147a059ae42202bb82bb964be8e Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Tue, 27 Jan 2026 14:27:52 -0800 Subject: [PATCH 2/2] Make generation --- .../calico/crd.projectcalico.org_felixconfigurations.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml index cd33e38e17..89d9263ad3 100644 --- a/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml +++ b/pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml @@ -1020,12 +1020,14 @@ spec: format: int32 type: integer nftablesMode: + default: Auto description: "NFTablesMode configures nftables support in Felix. [Default: - Disabled]" + Auto]" enum: - Disabled - Enabled + - Auto type: string nftablesRefreshInterval: description: