Skip to content
Snippets Groups Projects
Unverified Commit eda7ea56 authored by Ryan Lonergan's avatar Ryan Lonergan Committed by GitHub
Browse files

feat: add support for Cilium 1.14 (#10684)


* update cilium configmap template for new routing mode and tunnel-protocol options
Ryan Lonergan ryan.tlonergan@gmail.com

* add rbac for new cilium crd in 1.14
Ryan Lonergan ryan.tlonergan@gmail.com

* add conditional for cni-install.sh that's no longer included in cilium 1.14
Ryan Lonergan ryan.tlonergan@gmail.com

* Update roles/network_plugin/cilium/templates/cilium/ds.yml.j2

Co-authored-by: default avatarCyclinder <qifeng.guo@daocloud.io>

---------

Co-authored-by: default avatarCyclinder <qifeng.guo@daocloud.io>
parent 08c0b342
No related branches found
No related tags found
No related merge requests found
...@@ -115,7 +115,14 @@ data: ...@@ -115,7 +115,14 @@ data:
# - disabled # - disabled
# - vxlan (default) # - vxlan (default)
# - geneve # - geneve
{% if cilium_version | regex_replace('v') is version('1.14.0', '<') %}
tunnel: "{{ cilium_tunnel_mode }}" 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 # Enable Bandwidth Manager
# Cilium’s bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation. # Cilium’s bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation.
......
...@@ -120,3 +120,12 @@ rules: ...@@ -120,3 +120,12 @@ rules:
- list - list
- watch - watch
{% endif %} {% endif %}
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
- apiGroups:
- cilium.io
resources:
- ciliumcidrgroups
verbs:
- list
- watch
{% endif %}
...@@ -106,6 +106,7 @@ spec: ...@@ -106,6 +106,7 @@ spec:
- {{ env_var | to_nice_yaml(indent=2) | indent(10) }} - {{ env_var | to_nice_yaml(indent=2) | indent(10) }}
{% endfor %} {% endfor %}
lifecycle: lifecycle:
{% if cilium_version | regex_replace('v') is version('1.14', '<') %}
postStart: postStart:
exec: exec:
command: command:
...@@ -114,6 +115,7 @@ spec: ...@@ -114,6 +115,7 @@ spec:
{% if cilium_version | regex_replace('v') is version('1.12', '>=') %} {% if cilium_version | regex_replace('v') is version('1.12', '>=') %}
- "--enable-debug={{ cilium_debug | string | lower }}" - "--enable-debug={{ cilium_debug | string | lower }}"
- "--log-file={{ cilium_cni_log_file }}" - "--log-file={{ cilium_cni_log_file }}"
{% endif %}
{% endif %} {% endif %}
preStop: preStop:
exec: exec:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment