From 17e6ab1e33cde972d16a1846402b85461ffc5af9 Mon Sep 17 00:00:00 2001 From: Jiffs Maverick Date: Sun, 16 Oct 2022 23:42:56 +0300 Subject: [PATCH] Merged urls to new and old releases of calicoctl in a single link --- inventory/sample/group_vars/all/offline.yml | 3 +-- roles/download/defaults/main.yml | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/inventory/sample/group_vars/all/offline.yml b/inventory/sample/group_vars/all/offline.yml index 9ea31ffca..bf31c4b98 100644 --- a/inventory/sample/group_vars/all/offline.yml +++ b/inventory/sample/group_vars/all/offline.yml @@ -32,8 +32,7 @@ # etcd_download_url: "{{ files_repo }}/github.com/etcd-io/etcd/releases/download/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-{{ image_arch }}.tar.gz" # [Optional] Calico: If using Calico network plugin -# calicoctl_download_url: "{{ files_repo }}/github.com/projectcalico/calico/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" -# calicoctl_alternate_download_url: "{{ files_repo }}/github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" +# calicoctl_download_url: "{{ files_repo }}/github.com/projectcalico/{{ 'calico' if (calico_ctl_version is version('v3.21.3','>=')) else 'calicoctl' }}/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" # [Optional] Calico with kdd: If using Calico network plugin with kdd datastore # calico_crds_download_url: "{{ files_repo }}/github.com/projectcalico/calico/archive/{{ calico_version }}.tar.gz" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 088f58a53..7af545ea5 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -148,8 +148,7 @@ kubectl_download_url: "https://storage.googleapis.com/kubernetes-release/release kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release/{{ kubeadm_version }}/bin/linux/{{ image_arch }}/kubeadm" etcd_download_url: "https://github.com/etcd-io/etcd/releases/download/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-{{ image_arch }}.tar.gz" cni_download_url: "https://github.com/containernetworking/plugins/releases/download/{{ cni_version }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" -calicoctl_download_url: "https://github.com/projectcalico/calico/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" -calicoctl_alternate_download_url: "https://github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" +calicoctl_download_url: "https://github.com/projectcalico/{{ 'calico' if (calico_ctl_version is version('v3.21.3','>=')) else 'calicoctl' }}/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" calico_crds_download_url: "https://github.com/projectcalico/calico/archive/{{ calico_version }}.tar.gz" crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ crictl_version }}/crictl-{{ crictl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz" helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz" @@ -1300,9 +1299,6 @@ downloads: dest: "{{ local_release_dir }}/calicoctl" sha256: "{{ calicoctl_binary_checksum }}" url: "{{ calicoctl_download_url }}" - mirrors: - - "{{ calicoctl_alternate_download_url }}" - - "{{ calicoctl_download_url }}" unarchive: false owner: "root" mode: "0755"