diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index a19134b98b304704c94d4b948eeeacc51a15e362..19315a7399f37bc9d6eb81cec95b3c9d1ee5d5f6 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -80,7 +80,7 @@ cni_version: "v0.8.3" weave_version: 2.5.2 pod_infra_version: 3.1 contiv_version: 1.2.1 -cilium_version: "v1.5.5" +cilium_version: "v1.7.1" kube_ovn_version: "v0.6.0" kube_router_version: "v0.2.5" multus_version: "v3.2.1" diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml index 70696cc6bdfcf7c5d329abaeb579a5199c8f9aed..ea73a843c0613d7754e85fc59de66160bbed4ce3 100755 --- a/roles/network_plugin/cilium/defaults/main.yml +++ b/roles/network_plugin/cilium/defaults/main.yml @@ -23,6 +23,8 @@ cilium_tunnel_mode: vxlan cilium_enable_prometheus: false # Enable if you want to make use of hostPort mappings cilium_enable_portmap: false +# Monitor aggregation level (none/low/medium/maximum) +cilium_monitor_aggregation: medium # If upgrading from Cilium < 1.5, you may want to override some of these options # to prevent service disruptions. See also: diff --git a/roles/network_plugin/cilium/templates/cilium-config.yml.j2 b/roles/network_plugin/cilium/templates/cilium-config.yml.j2 index 7a343d9fe34af519ad6005116126370ad844b4cf..94cb27149553f453b4e5db42d67d548b5ed85174 100644 --- a/roles/network_plugin/cilium/templates/cilium-config.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium-config.yml.j2 @@ -61,7 +61,7 @@ data: # If you want cilium monitor to aggregate tracing for packets, set this level # to "low", "medium", or "maximum". The higher the level, the less packets # that will be seen in monitor output. - monitor-aggregation-level: "none" + monitor-aggregation: "{{ cilium_monitor_aggregation }}" # ct-global-max-entries-* specifies the maximum number of connections # supported across all endpoints, split by protocol: tcp or other. One pair diff --git a/roles/network_plugin/cilium/templates/cilium-cr.yml.j2 b/roles/network_plugin/cilium/templates/cilium-cr.yml.j2 index 9bdec5aed566e26fd5957acfb0c65c870d47c115..94be6867aeb2b20d69957a6c216b33cdcc992efb 100644 --- a/roles/network_plugin/cilium/templates/cilium-cr.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium-cr.yml.j2 @@ -43,6 +43,10 @@ rules: - ciliumnetworkpolicies/status - ciliumendpoints - ciliumendpoints/status + - ciliumnodes + - ciliumnodes/status + - ciliumidentities + - ciliumidentities/status verbs: - '*' --- @@ -66,7 +70,6 @@ rules: - services - nodes - endpoints - - componentstatuses verbs: - get - list @@ -88,18 +91,10 @@ rules: - nodes/status verbs: - patch - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - create - - get - - list - - watch - apiGroups: - apiextensions.k8s.io resources: + - ingresses - customresourcedefinitions verbs: - create @@ -112,7 +107,13 @@ rules: resources: - ciliumnetworkpolicies - ciliumnetworkpolicies/status + - ciliumclusterwidenetworkpolicies + - ciliumclusterwidenetworkpolicies/status - ciliumendpoints - ciliumendpoints/status + - ciliumnodes + - ciliumnodes/status + - ciliumidentities + - ciliumidentities/status verbs: - '*'