From 9975b5d525e38b40ec3ca415f7b00d68d3df4782 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Thu, 20 Nov 2025 12:56:01 +0000 Subject: [PATCH] Remove download support for old calico versions (#12724) we no longer deploy those versions --- .../defaults/main/download.yml | 4 ++-- roles/network_plugin/calico/tasks/install.yml | 16 +--------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/roles/kubespray_defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml index d1c74c6c8..8c2e2432f 100644 --- a/roles/kubespray_defaults/defaults/main/download.yml +++ b/roles/kubespray_defaults/defaults/main/download.yml @@ -786,9 +786,9 @@ downloads: url: "{{ calico_crds_download_url }}" unarchive: true unarchive_extra_opts: - - "{{ '--strip=6' if (calico_version is version('3.22.3', '<')) else '--strip=3' }}" + - "--strip=3" - "--wildcards" - - "{{ '*/_includes/charts/calico/crds/kdd/' if (calico_version is version('3.22.3', '<')) else '*/libcalico-go/config/crd/' }}" + - "*/libcalico-go/config/crd/" owner: "root" mode: "0755" groups: diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index 6b5d483b5..0e20472e6 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -126,23 +126,9 @@ - ('kube_control_plane' in group_names) - calico_datastore == "kdd" block: - - name: Calico | Check if extra directory is needed - stat: - path: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/{{ 'kdd' if (calico_version is version('3.22.3', '<')) else 'crd' }}" - register: kdd_path - - name: Calico | Set kdd path when calico < v3.22.3 - set_fact: - calico_kdd_path: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds{{ '/kdd' if kdd_path.stat.exists is defined and kdd_path.stat.exists }}" - when: - - calico_version is version('3.22.3', '<') - - name: Calico | Set kdd path when calico > 3.22.2 - set_fact: - calico_kdd_path: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds{{ '/crd' if kdd_path.stat.exists is defined and kdd_path.stat.exists }}" - when: - - calico_version is version('3.22.2', '>') - name: Calico | Create calico manifests for kdd assemble: - src: "{{ calico_kdd_path }}" + src: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/crd/" dest: "{{ kube_config_dir }}/kdd-crds.yml" mode: "0644" delimiter: "---\n"