mirror of https://github.com/kubernetes/kops.git
Merge pull request #17410 from runitmisra/fix-cilium-cni-docs
[docs] fixed cilium cni exclusive topic placement
This commit is contained in:
commit
5dd2f468b4
|
|
@ -168,18 +168,7 @@ 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
|
||||
### 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:
|
||||
|
|
@ -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') }}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue