Add a way to deploy cilium alongside another CNI (#6373)
Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
This commit is contained in:
parent
8818073ff3
commit
1a1fe99669
5 changed files with 10 additions and 6 deletions
|
@ -677,7 +677,7 @@ downloads:
|
|||
- k8s-cluster
|
||||
|
||||
cilium:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
container: true
|
||||
repo: "{{ cilium_image_repo }}"
|
||||
tag: "{{ cilium_image_tag }}"
|
||||
|
@ -686,7 +686,7 @@ downloads:
|
|||
- k8s-cluster
|
||||
|
||||
cilium_init:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
container: true
|
||||
repo: "{{ cilium_init_image_repo }}"
|
||||
tag: "{{ cilium_init_image_tag }}"
|
||||
|
@ -695,7 +695,7 @@ downloads:
|
|||
- k8s-cluster
|
||||
|
||||
cilium_operator:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
container: true
|
||||
repo: "{{ cilium_operator_image_repo }}"
|
||||
tag: "{{ cilium_operator_image_tag }}"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
dependencies:
|
||||
- role: kubernetes-apps/network_plugin/cilium
|
||||
when: kube_network_plugin == 'cilium'
|
||||
when: kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool
|
||||
tags:
|
||||
- cilium
|
||||
|
||||
|
|
|
@ -130,7 +130,7 @@
|
|||
assert:
|
||||
that: ansible_kernel.split('-')[0] is version('4.9.17', '>=')
|
||||
when:
|
||||
- kube_network_plugin == 'cilium'
|
||||
- kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool
|
||||
- not ignore_assert_errors
|
||||
|
||||
- name: Stop if bad hostname
|
||||
|
|
|
@ -33,3 +33,7 @@ cilium_monitor_aggregation: medium
|
|||
cilium_preallocate_bpf_maps: false
|
||||
cilium_tofqdns_enable_poller: false
|
||||
cilium_enable_legacy_services: false
|
||||
|
||||
# Deploy cilium even if kube_network_plugin is not cilium.
|
||||
# This enables to deploy cilium alongside another CNI to replace kube-proxy.
|
||||
cilium_deploy_additionally: false
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
dependencies:
|
||||
- role: network_plugin/cilium
|
||||
when: kube_network_plugin == 'cilium'
|
||||
when: kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool
|
||||
tags:
|
||||
- cilium
|
||||
|
||||
|
|
Loading…
Reference in a new issue