Browse Source
Add cilium_extra_values to make use of any cilium values (#12375)
fix noqa
pull/12450/head
Clement Phu
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
17 additions and
1 deletions
-
inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml
-
roles/network_plugin/cilium/defaults/main.yml
-
roles/network_plugin/cilium/tasks/apply.yml
-
roles/network_plugin/cilium/tasks/install.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: {} |
|
|
@ -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: {} |
|
|
@ -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 |
|
|
|
|
|
@ -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" |
|
|
|