From 7a1c5ebc572495e1aeccc27ec8cdc40b27de1334 Mon Sep 17 00:00:00 2001 From: runitmisra Date: Tue, 20 May 2025 17:33:03 +0530 Subject: [PATCH 1/2] fixed cilium cni exclusive topic placement --- docs/networking/cilium.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/networking/cilium.md b/docs/networking/cilium.md index 284a22c139..91c531fee4 100644 --- a/docs/networking/cilium.md +++ b/docs/networking/cilium.md @@ -168,17 +168,6 @@ Cilium can make use of the [wireguard protocol for transparent encryption](https encryptionType: wireguard ``` -#### CNI Exclusive -{{ kops_feature_table(kops_added_default='1.32') }} - -If you want to use additional CNI plugins, for example when using service meshes like Istio or Linkerd, It is required to disable the `cni-exclusive` option so that Cilium does not remove the other CNI configuration files. - -```yaml - networking: - cilium: - cniExclusive: false -``` - #### Resources in Cilium {{ kops_feature_table(kops_added_default='1.21', k8s_min='1.20') }} @@ -190,6 +179,17 @@ As of kOps 1.20, it is possible to choose your own values for Cilium Agents + Op memoryRequest: "128Mi" ``` +### CNI Exclusive +{{ kops_feature_table(kops_added_default='1.32') }} + +If you want to use additional CNI plugins, for example when using service meshes like Istio or Linkerd, It is required to disable the `cni-exclusive` option so that Cilium does not remove the other CNI configuration files. + +```yaml + networking: + cilium: + cniExclusive: false +``` + ## Hubble {{ kops_feature_table(kops_added_default='1.20.1', k8s_min='1.20') }} From 36d54b307b9b0945b8b25e576b0cadbc3a8d6216 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 2 Jun 2025 09:27:17 +0300 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Peter Rifel --- docs/networking/cilium.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/networking/cilium.md b/docs/networking/cilium.md index 91c531fee4..4aaffb0136 100644 --- a/docs/networking/cilium.md +++ b/docs/networking/cilium.md @@ -168,7 +168,7 @@ Cilium can make use of the [wireguard protocol for transparent encryption](https encryptionType: wireguard ``` -#### Resources in Cilium +### Resources in Cilium {{ kops_feature_table(kops_added_default='1.21', k8s_min='1.20') }} As of kOps 1.20, it is possible to choose your own values for Cilium Agents + Operator. Example: