Update Calico and Canal to fix issue on ARM (#3228)

* Update Calico and Canal to fix issue on ARM * Use single arch for CNI plugin images * Fix incorrect checksums
hitachienergy · Jul 29, 2022 · b8a62b5 · b8a62b5
1 parent fe65786
commit b8a62b5
Show file tree

Hide file tree

Showing 10 changed files with 1,487 additions and 678 deletions.
diff --git a/ansible/playbooks/group_vars/all.yml b/ansible/playbooks/group_vars/all.yml
@@ -11,7 +11,3 @@ kubeconfig:
 
 # https://github.com/ansible/ansible/issues/57189
 yum_lock_timeout: 300
-
-global_architecture_alias:
-  x86_64: amd64
-  aarch64: arm64
diff --git a/ansible/playbooks/roles/kubernetes_master/tasks/cni-plugins/calico.yml b/ansible/playbooks/roles/kubernetes_master/tasks/cni-plugins/calico.yml
@@ -37,5 +37,4 @@
 - name: Include Calico deployment tasks
   include_tasks: deployments/deploy-template.yml
   vars:
-    calico_arch: "{{ global_architecture_alias[ansible_architecture] }}"
     file_name: calico.yml.j2
diff --git a/ansible/playbooks/roles/kubernetes_master/tasks/cni-plugins/canal.yml b/ansible/playbooks/roles/kubernetes_master/tasks/cni-plugins/canal.yml
@@ -38,5 +38,4 @@
 - name: Include Canal deployment tasks
   include_tasks: deployments/deploy-template.yml
   vars:
-    canal_arch: "{{ global_architecture_alias[ansible_architecture] }}"
     file_name: canal.yml.j2
diff --git a/ansible/playbooks/roles/kubernetes_master/templates/calico.yml.j2 b/ansible/playbooks/roles/kubernetes_master/templates/calico.yml.j2
diff --git a/ansible/playbooks/roles/kubernetes_master/templates/canal.yml.j2 b/ansible/playbooks/roles/kubernetes_master/templates/canal.yml.j2