Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for Cilium 1.14 #10684

Merged
merged 4 commits into from
Jan 8, 2024
Merged

feat: add support for Cilium 1.14 #10684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7ad740
update cilium configmap template for new routing mode and tunnel-prot…
rl0nergan Dec 1, 2023
333b588
add rbac for new cilium crd in 1.14
rl0nergan Dec 1, 2023
67b405b
add conditional for cni-install.sh that's no longer included in ciliu…
rl0nergan Dec 1, 2023
47b4859
Update roles/network_plugin/cilium/templates/cilium/ds.yml.j2
rl0nergan Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions roles/network_plugin/cilium/templates/cilium/config.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,14 @@ data:
# - disabled
# - vxlan (default)
# - geneve
{% if cilium_version | regex_replace('v') is version('1.14.0', '<') %}
tunnel: "{{ cilium_tunnel_mode }}"
{% elif cilium_version | regex_replace('v') is version('1.14.0', '>=') and cilium_tunnel_mode == 'disabled' %}
routing-mode: 'native'
{% elif cilium_version | regex_replace('v') is version('1.14.0', '>=') and cilium_tunnel_mode != 'disabled' %}
routing-mode: 'tunnel'
tunnel-protocol: "{{ cilium_tunnel_mode }}"
{% endif %}

# Enable Bandwidth Manager
# Cilium’s bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation.
Expand Down
9 changes: 9 additions & 0 deletions roles/network_plugin/cilium/templates/cilium/cr.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,12 @@ rules:
- list
- watch
{% endif %}
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
- apiGroups:
- cilium.io
resources:
- ciliumcidrgroups
verbs:
- list
- watch
{% endif %}
2 changes: 2 additions & 0 deletions roles/network_plugin/cilium/templates/cilium/ds.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ spec:
- {{ env_var | to_nice_yaml(indent=2) | indent(10) }}
{% endfor %}
lifecycle:
{% if cilium_version | regex_replace('v') is version('1.14', '<') %}
postStart:
exec:
command:
Expand All @@ -114,6 +115,7 @@ spec:
{% if cilium_version | regex_replace('v') is version('1.12', '>=') %}
- "--enable-debug={{ cilium_debug | string | lower }}"
- "--log-file={{ cilium_cni_log_file }}"
{% endif %}
{% endif %}
preStop:
exec:
Expand Down