From a534eb45ce6ee3e577bff200c358b9bf8971df7f Mon Sep 17 00:00:00 2001 From: ERIK Date: Thu, 1 Dec 2022 19:18:27 +0800 Subject: [PATCH] Update calico image tag (#9529) Signed-off-by: bo.jiang Signed-off-by: bo.jiang --- roles/download/defaults/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index d79f8590c..26154da7c 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -950,17 +950,17 @@ flannel_image_tag: "{{ flannel_version }}-{{ image_arch }}" flannel_init_image_repo: "{{ docker_image_repo }}/flannelcni/flannel-cni-plugin" flannel_init_image_tag: "{{ flannel_cni_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_node_image_tag: "{{ calico_version }}" calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni" -calico_cni_image_tag: "{{ calico_cni_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" +calico_cni_image_tag: "{{ calico_cni_version }}" calico_flexvol_image_repo: "{{ quay_image_repo }}/calico/pod2daemon-flexvol" -calico_flexvol_image_tag: "{{ calico_flexvol_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" +calico_flexvol_image_tag: "{{ calico_flexvol_version }}" calico_policy_image_repo: "{{ quay_image_repo }}/calico/kube-controllers" -calico_policy_image_tag: "{{ calico_policy_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" +calico_policy_image_tag: "{{ calico_policy_version }}" calico_typha_image_repo: "{{ quay_image_repo }}/calico/typha" -calico_typha_image_tag: "{{ calico_typha_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" +calico_typha_image_tag: "{{ calico_typha_version }}" calico_apiserver_image_repo: "{{ quay_image_repo }}/calico/apiserver" -calico_apiserver_image_tag: "{{ calico_apiserver_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" +calico_apiserver_image_tag: "{{ calico_apiserver_version }}" pod_infra_image_repo: "{{ kube_image_repo }}/pause" pod_infra_image_tag: "{{ pod_infra_version }}" netcheck_version: "v1.2.2"