From 23f8593cf5c9b266ec645660d45cf5c4072ee38a Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Thu, 17 Sep 2026 07:41:25 +0000 Subject: [PATCH] download/calico_crds: use flat manifest path (#13522) The additional directory is unnecessary. --- roles/kubespray_defaults/defaults/main/download.yml | 2 +- roles/network_plugin/calico/tasks/install.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubespray_defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml index 315d96aef..a83f5a8dc 100644 --- a/roles/kubespray_defaults/defaults/main/download.yml +++ b/roles/kubespray_defaults/defaults/main/download.yml @@ -746,7 +746,7 @@ downloads: calico_crds: file: true enabled: "{{ kube_network_plugin == 'calico' and calico_datastore == 'kdd' }}" - dest: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/crds.yaml" + dest: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds.yaml" checksum: "{{ calico_crds_checksums.no_arch[calico_version] }}" url: "{{ calico_crds_download_url }}" owner: "root" diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index d2992f35e..d01f592f2 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -128,7 +128,7 @@ block: - name: Calico | Create calico manifests for kdd copy: - src: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/crds.yaml" + src: "{{ downloads.calico_crds.dest }}" dest: "{{ kube_config_dir }}/kdd-crds.yml" mode: "0644" remote_src: true