feat: Add support for cilium 1.15 and updated cilium to v1.15.4 (#11106)

pull/11013/head
Devesh Kumar 2024-04-24 04:42:11 +02:00 committed by GitHub
parent ab0ef182fb
commit eee5b5890d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 67 additions and 4 deletions

View File

@ -168,7 +168,7 @@ Note: Upstart/SysV init based OS types are not supported.
- Network Plugin - Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v1.2.0 - [cni-plugins](https://github.com/containernetworking/plugins) v1.2.0
- [calico](https://github.com/projectcalico/calico) v3.27.2 - [calico](https://github.com/projectcalico/calico) v3.27.2
- [cilium](https://github.com/cilium/cilium) v1.13.4 - [cilium](https://github.com/cilium/cilium) v1.15.4
- [flannel](https://github.com/flannel-io/flannel) v0.22.0 - [flannel](https://github.com/flannel-io/flannel) v0.22.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.11.5 - [kube-ovn](https://github.com/alauda/kube-ovn) v1.11.5
- [kube-router](https://github.com/cloudnativelabs/kube-router) v2.0.0 - [kube-router](https://github.com/cloudnativelabs/kube-router) v2.0.0

View File

@ -99,7 +99,7 @@ cilium_operator_extra_volume_mounts:
## Choose Cilium version ## Choose Cilium version
```yml ```yml
cilium_version: v1.12.1 cilium_version: v1.15.4
``` ```
## Add variable to config ## Add variable to config

View File

@ -1,5 +1,5 @@
--- ---
# cilium_version: "v1.12.1" # cilium_version: "v1.15.4"
# Log-level # Log-level
# cilium_debug: false # cilium_debug: false
@ -8,6 +8,9 @@
# cilium_enable_ipv4: true # cilium_enable_ipv4: true
# cilium_enable_ipv6: false # cilium_enable_ipv6: false
# Enable l2 announcement from cilium to replace Metallb Ref: https://docs.cilium.io/en/v1.14/network/l2-announcements/
cilium_l2announcements: false
# Cilium agent health port # Cilium agent health port
# cilium_agent_health_port: "9879" # cilium_agent_health_port: "9879"
@ -40,6 +43,10 @@
# Overlay Network Mode # Overlay Network Mode
# cilium_tunnel_mode: vxlan # cilium_tunnel_mode: vxlan
# LoadBalancer Mode (snat/dsr/hybrid) Ref: https://docs.cilium.io/en/stable/network/kubernetes/kubeproxy-free/#dsr-mode
# cilium_loadbalancer_mode: snat
# Optional features # Optional features
# cilium_enable_prometheus: false # cilium_enable_prometheus: false
# Enable if you want to make use of hostPort mappings # Enable if you want to make use of hostPort mappings

View File

@ -116,7 +116,7 @@ flannel_cni_version: "v1.1.2"
cni_version: "v1.3.0" cni_version: "v1.3.0"
weave_version: 2.8.1 weave_version: 2.8.1
cilium_version: "v1.13.4" cilium_version: "v1.15.4"
cilium_cli_version: "v0.16.0" cilium_cli_version: "v0.16.0"
cilium_enable_hubble: false cilium_enable_hubble: false

View File

@ -7,6 +7,9 @@ cilium_mtu: ""
cilium_enable_ipv4: true cilium_enable_ipv4: true
cilium_enable_ipv6: false cilium_enable_ipv6: false
# Enable l2 announcement from cilium to replace Metallb Ref: https://docs.cilium.io/en/v1.14/network/l2-announcements/
cilium_l2announcements: false
# Cilium agent health port # Cilium agent health port
cilium_agent_health_port: "{%- if cilium_version | regex_replace('v') is version('1.11.6', '>=') -%}9879{%- else -%}9876{%- endif -%}" cilium_agent_health_port: "{%- if cilium_version | regex_replace('v') is version('1.11.6', '>=') -%}9879{%- else -%}9876{%- endif -%}"
@ -39,6 +42,10 @@ cilium_cpu_requests: 100m
# Overlay Network Mode # Overlay Network Mode
cilium_tunnel_mode: vxlan cilium_tunnel_mode: vxlan
# LoadBalancer Mode (snat/dsr/hybrid) Ref: https://docs.cilium.io/en/stable/network/kubernetes/kubeproxy-free/#dsr-mode
cilium_loadbalancer_mode: snat
# Optional features # Optional features
cilium_enable_prometheus: false cilium_enable_prometheus: false
# Enable if you want to make use of hostPort mappings # Enable if you want to make use of hostPort mappings

View File

@ -97,6 +97,11 @@ rules:
- ciliumloadbalancerippools/status - ciliumloadbalancerippools/status
- ciliumbgppeeringpolicies - ciliumbgppeeringpolicies
- ciliumenvoyconfigs - ciliumenvoyconfigs
{% endif %}
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
- ciliumbgppeerconfigs
- ciliumbgpadvertisements
- ciliumbgpnodeconfigs
{% endif %} {% endif %}
verbs: verbs:
- '*' - '*'
@ -146,6 +151,20 @@ rules:
- ciliumlocalredirectpolicies.cilium.io - ciliumlocalredirectpolicies.cilium.io
- ciliumnetworkpolicies.cilium.io - ciliumnetworkpolicies.cilium.io
- ciliumnodes.cilium.io - ciliumnodes.cilium.io
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
- ciliumnodeconfigs.cilium.io
- ciliumcidrgroups.cilium.io
- ciliuml2announcementpolicies.cilium.io
- ciliumpodippools.cilium.io
- ciliumloadbalancerippools.cilium.io
{% endif %}
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
- ciliumbgpclusterconfigs.cilium.io
- ciliumbgppeerconfigs.cilium.io
- ciliumbgpadvertisements.cilium.io
- ciliumbgpnodeconfigs.cilium.io
- ciliumbgpnodeconfigoverrides.cilium.io
{% endif %}
{% endif %} {% endif %}
{% for rules in cilium_clusterrole_rules_operator_extra_vars %} {% for rules in cilium_clusterrole_rules_operator_extra_vars %}
- apiGroups: - apiGroups:

View File

@ -131,6 +131,12 @@ data:
tunnel-protocol: "{{ cilium_tunnel_mode }}" tunnel-protocol: "{{ cilium_tunnel_mode }}"
{% endif %} {% endif %}
## DSR setting
bpf-lb-mode: "{{ cilium_loadbalancer_mode }}"
# l2
enable-l2-announcements: "{{ cilium_l2announcements }}"
# Enable Bandwidth Manager # Enable Bandwidth Manager
# Ciliums bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation. # Ciliums bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation.
# Bandwidth enforcement currently does not work in combination with L7 Cilium Network Policies. # Bandwidth enforcement currently does not work in combination with L7 Cilium Network Policies.

View File

@ -106,6 +106,15 @@ rules:
- ciliumnodes/finalizers - ciliumnodes/finalizers
- ciliumidentities/finalizers - ciliumidentities/finalizers
- ciliumlocalredirectpolicies/finalizers - ciliumlocalredirectpolicies/finalizers
{% endif %}
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
- ciliuml2announcementpolicies/status
{% endif %}
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
- ciliumbgpnodeconfigs
- ciliumbgpnodeconfigs/status
- ciliumbgpadvertisements
- ciliumbgppeerconfigs
{% endif %} {% endif %}
verbs: verbs:
- '*' - '*'
@ -125,7 +134,22 @@ rules:
- cilium.io - cilium.io
resources: resources:
- ciliumcidrgroups - ciliumcidrgroups
- ciliuml2announcementpolicies
- ciliumpodippools
- ciliuml2announcementpolicies/status
verbs: verbs:
- list - list
- watch - watch
{% if cilium_version %}
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- create
- get
- update
- list
- delete
{% endif %}
{% endif %} {% endif %}