mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-28 09:39:12 +03:00
Move cilium_deploy_additionnaly to kubespray-default (#12191)
Instead of using default(false) all over the place, use kubespray-defaults
This commit is contained in:
@@ -632,7 +632,7 @@ downloads:
|
||||
- kube_control_plane
|
||||
|
||||
cilium:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally }}"
|
||||
container: true
|
||||
repo: "{{ cilium_image_repo }}"
|
||||
tag: "{{ cilium_image_tag }}"
|
||||
@@ -641,7 +641,7 @@ downloads:
|
||||
- k8s_cluster
|
||||
|
||||
cilium_operator:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally }}"
|
||||
container: true
|
||||
repo: "{{ cilium_operator_image_repo }}"
|
||||
tag: "{{ cilium_operator_image_tag }}"
|
||||
@@ -695,7 +695,7 @@ downloads:
|
||||
- k8s_cluster
|
||||
|
||||
ciliumcli:
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool }}"
|
||||
enabled: "{{ kube_network_plugin == 'cilium' or cilium_deploy_additionally }}"
|
||||
file: true
|
||||
dest: "{{ local_release_dir }}/cilium-{{ cilium_cli_version }}-{{ image_arch }}.tar.gz"
|
||||
checksum: "{{ ciliumcli_binary_checksum }}"
|
||||
|
||||
@@ -204,6 +204,12 @@ kube_log_level: 2
|
||||
kube_network_plugin: calico
|
||||
kube_network_plugin_multus: false
|
||||
|
||||
## Network plugin options with dependencies across the whole playbook
|
||||
|
||||
# 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
|
||||
|
||||
# Determines if calico_rr group exists
|
||||
peer_with_calico_rr: "{{ 'calico_rr' in groups and groups['calico_rr'] | length > 0 }}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user