diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml index dee44a58a..98e319d50 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml @@ -384,3 +384,7 @@ cilium_l2announcements: false # resourceNames: # - toto # cilium_clusterrole_rules_operator_extra_vars: [] + +# Cilium extra values, use any values from cilium Helm Chart +# ref: https://docs.cilium.io/en/stable/helm-reference/ +# cilium_extra_values: {} diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml index 36c453f80..42c54e5af 100644 --- a/roles/network_plugin/cilium/defaults/main.yml +++ b/roles/network_plugin/cilium/defaults/main.yml @@ -362,3 +362,7 @@ cilium_policy_audit_mode: false # Cilium extra install flags cilium_install_extra_flags: "" + +# Cilium extra values, use any values from cilium Helm Chart +# ref: https://docs.cilium.io/en/stable/helm-reference/ +cilium_extra_values: {} diff --git a/roles/network_plugin/cilium/tasks/apply.yml b/roles/network_plugin/cilium/tasks/apply.yml index c09c9780a..546a0a492 100644 --- a/roles/network_plugin/cilium/tasks/apply.yml +++ b/roles/network_plugin/cilium/tasks/apply.yml @@ -12,7 +12,7 @@ - name: Cilium | Install environment: "{{ proxy_env }}" - command: "{{ bin_dir }}/cilium {{ cilium_action }} --version {{ cilium_version }} -f {{ kube_config_dir }}/cilium-values.yaml {{ cilium_install_extra_flags }}" + command: "{{ bin_dir }}/cilium {{ cilium_action }} --version {{ cilium_version }} -f {{ kube_config_dir }}/cilium-values.yaml -f {{ kube_config_dir }}/cilium-extra-values.yaml {{ cilium_install_extra_flags }}" when: inventory_hostname == groups['kube_control_plane'][0] - name: Cilium | Wait for pods to run diff --git a/roles/network_plugin/cilium/tasks/install.yml b/roles/network_plugin/cilium/tasks/install.yml index 783891d56..252ba093f 100644 --- a/roles/network_plugin/cilium/tasks/install.yml +++ b/roles/network_plugin/cilium/tasks/install.yml @@ -45,6 +45,14 @@ when: - inventory_hostname == groups['kube_control_plane'][0] +- name: Cilium | Copy extra values + copy: + content: "{{ cilium_extra_values | to_nice_yaml(indent=2) }}" + dest: "{{ kube_config_dir }}/cilium-extra-values.yaml" + mode: "0644" + when: + - inventory_hostname == groups['kube_control_plane'][0] + - name: Cilium | Copy Ciliumcli binary from download dir copy: src: "{{ local_release_dir }}/cilium"