From bf0055038883b51096f84165492e686f9791e62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Necatican=20Y=C4=B1ld=C4=B1r=C4=B1m?= Date: Wed, 5 Jan 2022 11:36:32 +0300 Subject: [PATCH] Upgrade Cilium to 1.11.0 (#8354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove kvstore args from Cilium DaemonSet Co-authored-by: Emin Aktaş Co-authored-by: Yasin Taha Erol Signed-off-by: necatican * Bump Cilium to 1.11.0 Co-authored-by: Emin Aktaş Co-authored-by: Yasin Taha Erol Signed-off-by: necatican Co-authored-by: Emin Aktaş Co-authored-by: Yasin Taha Erol --- inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml | 2 ++ roles/download/defaults/main.yml | 2 +- roles/network_plugin/cilium/templates/cilium-ds.yml.j2 | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml index 95730eb03..dcd841665 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml @@ -1 +1,3 @@ # see roles/network_plugin/cilium/defaults/main.yml + +# cilium_version: "v1.11.0" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 932acc4ba..eecee3f56 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -84,7 +84,7 @@ flannel_cni_version: "v1.0.0" cni_version: "v1.0.1" weave_version: 2.8.1 pod_infra_version: "3.3" -cilium_version: "v1.9.11" +cilium_version: "v1.11.0" kube_ovn_version: "v1.8.1" kube_router_version: "v1.3.2" multus_version: "v3.8" diff --git a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 index 08aa56379..e70fbb9f0 100644 --- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 @@ -32,8 +32,6 @@ spec: topologyKey: kubernetes.io/hostname containers: - args: - - --kvstore=etcd - - --kvstore-opt=etcd.config=/var/lib/etcd-config/etcd.config - --config-dir=/tmp/cilium/config-map {% if cilium_mtu != "" %} - --mtu={{ cilium_mtu }}