From c3c9a425027bb90e2dd767c3135b3b34bf007f04 Mon Sep 17 00:00:00 2001 From: Cyclinder Date: Wed, 22 Jun 2022 01:56:26 +0800 Subject: [PATCH] support multus multi-architecture installation (#9012) Signed-off-by: cyclinder qifeng.guo@daocloud.io --- roles/download/defaults/main.yml | 2 +- roles/network_plugin/multus/templates/multus-daemonset.yml.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 06eb598f4..38b1e81b2 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -114,7 +114,7 @@ cilium_version: "v1.11.3" kube_ovn_version: "v1.9.2" kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}" kube_router_version: "v1.5.0" -multus_version: "v3.8" +multus_version: "v3.8-{{ image_arch }}" helm_version: "v3.8.2" nerdctl_version: "0.20.0" krew_version: "v0.4.2" diff --git a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 index de1f5e99d..494dee295 100644 --- a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 +++ b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 @@ -2,7 +2,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: - name: kube-multus-ds-amd64 + name: kube-multus-ds-{{ image_arch }} namespace: kube-system labels: tier: node @@ -21,7 +21,7 @@ spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet nodeSelector: - kubernetes.io/arch: amd64 + kubernetes.io/arch: {{ image_arch }} tolerations: - operator: Exists serviceAccountName: multus