Add image_arch in flannel image tag (kubernetes-sigs#7560)

* Add image_arch variable when download flannel image * Fix flannel image tag typo with image arch
southbridgeio · Jun 12, 2021 · f20abf3 · f20abf3
1 parent e994493
commit f20abf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -402,7 +402,7 @@ kube_proxy_image_tag: "{{ kube_version }}"
 etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
 etcd_image_tag: "{{ etcd_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}"
 flannel_image_repo: "{{ quay_image_repo }}/coreos/flannel"
-flannel_image_tag: "{{ flannel_version }}"
+flannel_image_tag: "{{ flannel_version }}-{{ image_arch }}"
 calico_node_image_repo: "{{ quay_image_repo }}/calico/node"
 calico_node_image_tag: "{{ calico_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}"
 calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni"

diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -66,7 +66,7 @@ spec:
       serviceAccountName: flannel
       containers:
       - name: kube-flannel
-        image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }}
+        image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }}
         imagePullPolicy: {{ k8s_image_pull_policy }}
         resources:
           limits:
@@ -109,7 +109,7 @@ spec:
                       - {{ arch }}
       initContainers:
       - name: install-cni
-        image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }}
+        image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }}
         command:
         - cp
         args: