diff --git a/roles/kubespray_defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml index 50873c3a4..e20818fd7 100644 --- a/roles/kubespray_defaults/defaults/main/download.yml +++ b/roles/kubespray_defaults/defaults/main/download.yml @@ -161,17 +161,17 @@ cni_download_url: "{{ github_url }}/containernetworking/plugins/releases/downloa calicoctl_download_url: "{{ github_url }}/projectcalico/calico/releases/download/v{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" calico_crds_download_url: "{{ github_url }}/projectcalico/calico/raw/v{{ calico_version }}/manifests/crds.yaml" ciliumcli_download_url: "{{ github_url }}/cilium/cilium-cli/releases/download/v{{ cilium_cli_version }}/cilium-linux-{{ image_arch }}.tar.gz" -crictl_download_url: "{{ github_url }}/kubernetes-sigs/cri-tools/releases/download/v{{ crictl_version }}/crictl-v{{ crictl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz" +crictl_download_url: "{{ github_url }}/kubernetes-sigs/cri-tools/releases/download/v{{ crictl_version }}/crictl-v{{ crictl_version }}-{{ ansible_facts['system'] | lower }}-{{ image_arch }}.tar.gz" crio_download_url: "{{ storage_googleapis_url }}/cri-o/artifacts/cri-o.{{ image_arch }}.v{{ crio_version }}.tar.gz" helm_download_url: "{{ get_helm_url }}/helm-v{{ helm_version }}-linux-{{ image_arch }}.tar.gz" runc_download_url: "{{ github_url }}/opencontainers/runc/releases/download/v{{ runc_version }}/runc.{{ image_arch }}" crun_download_url: "{{ github_url }}/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}" -youki_download_url: "{{ github_url }}/youki-dev/youki/releases/download/v{{ youki_version }}/youki-{{ youki_version }}-{{ ansible_architecture }}-gnu.tar.gz" +youki_download_url: "{{ github_url }}/youki-dev/youki/releases/download/v{{ youki_version }}/youki-{{ youki_version }}-{{ ansible_facts['architecture'] }}-gnu.tar.gz" kata_containers_download_url: "{{ github_url }}/kata-containers/kata-containers/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ image_arch }}.tar.xz" # gVisor only supports amd64 and uses x86_64 to in the download link -gvisor_runsc_download_url: "{{ storage_googleapis_url }}/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_architecture }}/runsc" -gvisor_containerd_shim_runsc_download_url: "{{ storage_googleapis_url }}/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_architecture }}/containerd-shim-runsc-v1" -nerdctl_download_url: "{{ github_url }}/containerd/nerdctl/releases/download/v{{ nerdctl_version }}/nerdctl-{{ nerdctl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz" +gvisor_runsc_download_url: "{{ storage_googleapis_url }}/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_facts['architecture'] }}/runsc" +gvisor_containerd_shim_runsc_download_url: "{{ storage_googleapis_url }}/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_facts['architecture'] }}/containerd-shim-runsc-v1" +nerdctl_download_url: "{{ github_url }}/containerd/nerdctl/releases/download/v{{ nerdctl_version }}/nerdctl-{{ nerdctl_version }}-{{ ansible_facts['system'] | lower }}-{{ image_arch }}.tar.gz" containerd_download_url: "{{ github_url }}/containerd/containerd/releases/download/v{{ containerd_version }}/containerd-{{ 'static-' if containerd_static_binary }}{{ containerd_version }}-linux-{{ image_arch }}.tar.gz" cri_dockerd_download_url: "{{ github_url }}/Mirantis/cri-dockerd/releases/download/v{{ cri_dockerd_version }}/cri-dockerd-{{ cri_dockerd_version }}.{{ image_arch }}.tgz" skopeo_download_url: "{{ github_url }}/lework/skopeo-binary/releases/download/v{{ skopeo_version }}/skopeo-linux-{{ image_arch }}" @@ -491,7 +491,7 @@ downloads: youki: file: true enabled: "{{ youki_enabled }}" - dest: "{{ local_release_dir }}/youki-{{ youki_version }}-{{ ansible_architecture }}.tar.gz" + dest: "{{ local_release_dir }}/youki-{{ youki_version }}-{{ ansible_facts['architecture'] }}.tar.gz" checksum: "{{ youki_archive_checksum }}" url: "{{ youki_download_url }}" unarchive: true @@ -539,7 +539,7 @@ downloads: gvisor_runsc: enabled: "{{ gvisor_enabled }}" file: true - dest: "{{ local_release_dir }}/gvisor-runsc-{{ gvisor_version }}-{{ ansible_architecture }}" + dest: "{{ local_release_dir }}/gvisor-runsc-{{ gvisor_version }}-{{ ansible_facts['architecture'] }}" checksum: "{{ gvisor_runsc_binary_checksum }}" url: "{{ gvisor_runsc_download_url }}" unarchive: false @@ -551,7 +551,7 @@ downloads: gvisor_containerd_shim: enabled: "{{ gvisor_enabled }}" file: true - dest: "{{ local_release_dir }}/gvisor-containerd-shim-runsc-v1-{{ gvisor_version }}-{{ ansible_architecture }}" + dest: "{{ local_release_dir }}/gvisor-containerd-shim-runsc-v1-{{ gvisor_version }}-{{ ansible_facts['architecture'] }}" checksum: "{{ gvisor_containerd_shim_binary_checksum }}" url: "{{ gvisor_containerd_shim_runsc_download_url }}" unarchive: false diff --git a/roles/kubespray_defaults/defaults/main/main.yml b/roles/kubespray_defaults/defaults/main/main.yml index 0f69066b1..36f07c1d7 100644 --- a/roles/kubespray_defaults/defaults/main/main.yml +++ b/roles/kubespray_defaults/defaults/main/main.yml @@ -650,12 +650,12 @@ local_volume_provisioner_storage_classes: | ssl_ca_dirs: |- [ - {% if ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] -%} + {% if ansible_facts['os_family'] in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] -%} '/usr/share/ca-certificates', - {% elif ansible_os_family == 'RedHat' -%} + {% elif ansible_facts['os_family'] == 'RedHat' -%} '/etc/pki/tls', '/etc/pki/ca-trust', - {% elif ansible_os_family == 'Debian' -%} + {% elif ansible_facts['os_family'] == 'Debian' -%} '/usr/share/ca-certificates', {% endif -%} ] @@ -755,10 +755,10 @@ _host_architecture_groups: aarch64: arm64 armv7l: arm host_architecture: >- - {%- if ansible_architecture in _host_architecture_groups -%} - {{ _host_architecture_groups[ansible_architecture] }} + {%- if ansible_facts['architecture'] in _host_architecture_groups -%} + {{ _host_architecture_groups[ansible_facts['architecture']] }} {%- else -%} - {{ ansible_architecture }} + {{ ansible_facts['architecture'] }} {%- endif -%} _host_os_groups: @@ -766,10 +766,10 @@ _host_os_groups: Darwin: darwin Win32NT: windows host_os: >- - {%- if ansible_system in _host_os_groups -%} - {{ _host_os_groups[ansible_system] }} + {%- if ansible_facts['system'] in _host_os_groups -%} + {{ _host_os_groups[ansible_facts['system']] }} {%- else -%} - {{ ansible_system }} + {{ ansible_facts['system'] }} {%- endif -%} # Sets the eventRecordQPS parameter in kubelet-config.yaml. @@ -823,7 +823,7 @@ ntp_enabled: false # The default is ntp for most platforms, or chrony on RHEL/CentOS 7 and later. # The ntp_package can be one of ['ntp', 'ntpsec', 'chrony'] ntp_package: >- - {% if ansible_os_family == "RedHat" -%} + {% if ansible_facts['os_family'] == "RedHat" -%} chrony {%- else -%} ntp