From 55c1860ff75756ba4d5b5ce89c137c2f05e25a65 Mon Sep 17 00:00:00 2001 From: Or Mergi Date: Wed, 9 Apr 2025 15:47:36 +0300 Subject: [PATCH] istio: Remove Multus settings from the default Istio config The default Istio config 'istio-operator.cr.yaml' is intended to be used when Multus is not installed in the cluster. Multus depends on the NetworkAttachmentDefinition CRD to be installed. Currently the default Istio config is invalid, because it specify setting that installs the istio-cni NetworkAttachmentDefinition CR, where it should be used when no Multus is installed. For setups that have Multus installed, the 'istio-operator-with-cnao.cr.yaml' should be used. Remove Multus related settings from the default Istio config. Signed-off-by: Or Mergi --- .../gocli/opts/istio/manifests/istio-operator.cr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml b/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml index 885e9a808b..3b397b6fa7 100644 --- a/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml +++ b/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml @@ -18,7 +18,6 @@ spec: global: jwtPolicy: third-party-jwt cni: - provider: multus chained: true cniBinDir: /opt/cni/bin cniConfDir: /etc/cni/net.d