Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read all ansible facts from ansible_facts[] instead of fact vars #41

Merged
merged 3 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ exclude_paths:
- charts
- molecule
skip_list:
- role-name
- role-name
2 changes: 1 addition & 1 deletion molecule/aio/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ provisioner:
operator:
replicas: 1
controllers:
keepalived_interface: "{{ ansible_default_ipv4.interface }}"
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"
keepalived_vip: 172.17.0.100
keepalived_vrid: 42
kubernetes_hostname: k8s
Expand Down
2 changes: 1 addition & 1 deletion molecule/cluster-api/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ provisioner:
operator:
replicas: 1
controllers:
keepalived_interface: "{{ ansible_default_ipv4.interface }}"
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"
keepalived_vip: 172.17.0.100
keepalived_vrid: 42
kubernetes_hostname: k8s
Expand Down
2 changes: 1 addition & 1 deletion molecule/containerd/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
- name: Run APT update
ansible.builtin.apt:
update_cache: yes
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
2 changes: 1 addition & 1 deletion molecule/forget-package/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- name: Run APT update
ansible.builtin.apt:
update_cache: yes
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"

- name: Install NGINX
ansible.builtin.package:
Expand Down
2 changes: 1 addition & 1 deletion molecule/ha/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ provisioner:
all:
kubernetes_version: ${KUBERNETES_VERSION-1.26.3}
controllers:
keepalived_interface: "{{ ansible_default_ipv4.interface }}"
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"
keepalived_vip: 172.17.0.100
keepalived_vrid: 42
kubernetes_hostname: k8s
Expand Down
2 changes: 1 addition & 1 deletion molecule/helm/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
- name: Run APT update
ansible.builtin.apt:
update_cache: yes
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
6 changes: 3 additions & 3 deletions molecule/kubernetes/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
- name: Install RHEL packages
ansible.builtin.package:
name:
# NOTE(mnaser): In order to get "ansible_default_ipv4"
# NOTE(mnaser): In order to get "ansible_facts['default_ipv4']"
- iproute
when: ansible_os_family == "RedHat"
when: ansible_facts['os_family'] == "RedHat"

- name: Uninstall RHEL packages
ansible.builtin.package:
Expand All @@ -62,7 +62,7 @@
# TODO(fitbeard): Use pip everywhere instead of OS package manager if possible.
- python3-pyyaml
state: absent
when: ansible_distribution == "Rocky"
when: ansible_facts['distribution'] == "Rocky"

- name: Start-up "dbus.socket" service
ansible.builtin.systemd:
Expand Down
2 changes: 1 addition & 1 deletion molecule/upload-helm-chart/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
- name: Run APT update
ansible.builtin.apt:
update_cache: yes
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
4 changes: 2 additions & 2 deletions roles/cni_plugins/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ cni_plugins_checksums:
arm64:
v1.2.0: 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57

cni_plugins_download_url: "https://github.com/containernetworking/plugins/releases/download/{{ cni_plugins_version }}/cni-plugins-{{ ansible_system | lower }}-{{ download_artifact_goarch }}-{{ cni_plugins_version }}.tgz" # noqa: yaml[line-length]
cni_plugins_download_dest: "{{ download_artifact_work_directory }}/kubernetes-cni-{{ cni_plugins_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tgz" # noqa: yaml[line-length]
cni_plugins_download_url: "https://github.com/containernetworking/plugins/releases/download/{{ cni_plugins_version }}/cni-plugins-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}-{{ cni_plugins_version }}.tgz" # noqa: yaml[line-length]
cni_plugins_download_dest: "{{ download_artifact_work_directory }}/kubernetes-cni-{{ cni_plugins_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tgz" # noqa: yaml[line-length]
cni_plugins_archive_checksum: "{{ cni_plugins_checksums[download_artifact_goarch][cni_plugins_version] }}"

# NOTE(mnaser): This is to accomodate for the uninstallation of the old packages
Expand Down
2 changes: 1 addition & 1 deletion roles/cni_plugins/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
directory_recurse: true
- role: forget_package
forget_package_name: "{{ cni_plugins_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ cni_plugins_download_url }}"
download_artifact_dest: "{{ cni_plugins_download_dest }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/containerd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ containerd_archive_checksums:
1.6.15: d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d
1.7.0: e7e5be2d9c92e076f1e2e15c9f0a6e0609ddb75f7616999b843cba92d01e4da2

containerd_download_url: "https://github.com/containerd/containerd/releases/download/v{{ containerd_version }}/containerd-{{ containerd_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
containerd_download_dest: "{{ download_artifact_work_directory }}/containerd-{{ containerd_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
containerd_download_url: "https://github.com/containerd/containerd/releases/download/v{{ containerd_version }}/containerd-{{ containerd_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
containerd_download_dest: "{{ download_artifact_work_directory }}/containerd-{{ containerd_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
containerd_archive_checksum: "{{ containerd_archive_checksums[download_artifact_goarch][containerd_version] }}"

containerd_pause_image: registry.k8s.io/pause:3.8
Expand Down
2 changes: 1 addition & 1 deletion roles/containerd/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- role: runc
- role: forget_package
forget_package_name: "{{ containerd_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ containerd_download_url }}"
download_artifact_dest: "{{ containerd_download_dest }}"
Expand Down
8 changes: 4 additions & 4 deletions roles/cri_tools/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ cri_tools_crictl_checksums:
arm64:
v1.25.0: 651c939eca010bbf48cc3932516b194028af0893025f9e366127f5b50ad5c4f4

cri_tools_crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ cri_tools_version }}/crictl-{{ cri_tools_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_crictl_download_dest: "{{ download_artifact_work_directory }}/crictl-{{ cri_tools_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ cri_tools_version }}/crictl-{{ cri_tools_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_crictl_download_dest: "{{ download_artifact_work_directory }}/crictl-{{ cri_tools_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_crictl_archive_checksum: "{{ cri_tools_crictl_checksums[download_artifact_goarch][cri_tools_version] }}"

cri_tools_critest_checksums:
Expand All @@ -29,8 +29,8 @@ cri_tools_critest_checksums:
arm64:
v1.25.0: fb42d54353b2b6c2417a82277748678d41438ae679fa8925a596953c3cf6c197

cri_tools_critest_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ cri_tools_version }}/critest-{{ cri_tools_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_critest_download_dest: "{{ download_artifact_work_directory }}/critest-{{ cri_tools_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_critest_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ cri_tools_version }}/critest-{{ cri_tools_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_critest_download_dest: "{{ download_artifact_work_directory }}/critest-{{ cri_tools_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz" # noqa: yaml[line-length]
cri_tools_critest_archive_checksum: "{{ cri_tools_critest_checksums[download_artifact_goarch][cri_tools_version] }}"

# NOTE(mnaser): This is to accomodate for the uninstallation of the old packages
Expand Down
2 changes: 1 addition & 1 deletion roles/cri_tools/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ galaxy_info:
dependencies:
- role: forget_package
forget_package_name: "{{ cri_tools_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ cri_tools_crictl_download_url }}"
download_artifact_dest: "{{ cri_tools_crictl_download_dest }}"
Expand Down
6 changes: 3 additions & 3 deletions roles/download_artifact/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
aarch64: arm64
armv7l: arm

download_artifact_goarch: >-

Check warning on line 20 in roles/download_artifact/vars/main.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

jinja[spacing]

Jinja2 spacing could be improved: {%- if ansible_facts['architecture'] in _download_artifact_goarch_groups -%} {{ _download_artifact_goarch_groups[ansible_facts['architecture']] }} {%- else -%} {{ ansible_facts['architecture'] }} {%- endif -%} -> {%- if ansible_facts['architecture'] in _download_artifact_goarch_groups -%} {{ _download_artifact_goarch_groups[ansible_facts['architecture']] }}{%- else -%} {{ ansible_facts['architecture'] }}{%- endif -%}
{%- if ansible_architecture in _download_artifact_goarch_groups -%}
{{ _download_artifact_goarch_groups[ansible_architecture] }}
{%- if ansible_facts['architecture'] in _download_artifact_goarch_groups -%}
{{ _download_artifact_goarch_groups[ansible_facts['architecture']] }}
{%- else -%}
{{ ansible_architecture }}
{{ ansible_facts['architecture'] }}
{%- endif -%}
8 changes: 4 additions & 4 deletions roles/helm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ helm_checksums:
v3.8.0: 23e08035dc0106fe4e0bd85800fd795b2b9ecd9f32187aa16c49b0a917105161
v3.11.2: 0a60baac83c3106017666864e664f52a4e16fbd578ac009f9a85456a9241c5db

helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz"
helm_download_dest: "{{ download_artifact_work_directory }}/helm-{{ helm_version }}-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tar.gz"
helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz"
helm_download_dest: "{{ download_artifact_work_directory }}/helm-{{ helm_version }}-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tar.gz"
helm_binary_checksum: "{{ helm_checksums[download_artifact_goarch][helm_version] }}"

# NOTE(fitbeard): This is to accomodate for the uninstallation of the old packages
Expand All @@ -37,6 +37,6 @@ helm_diff_checksums:
arm64:
v3.8.1: d451e4772a3987710f485de4caed760583c88f8f15864a623b3fbd73be7077ec

helm_diff_download_url: "https://github.com/databus23/helm-diff/releases/download/{{ helm_diff_version }}/helm-diff-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tgz" # noqa: yaml[line-length]
helm_diff_download_dest: "{{ download_artifact_work_directory }}/helm-diff-{{ ansible_system | lower }}-{{ download_artifact_goarch }}.tgz"
helm_diff_download_url: "https://github.com/databus23/helm-diff/releases/download/{{ helm_diff_version }}/helm-diff-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tgz" # noqa: yaml[line-length]
helm_diff_download_dest: "{{ download_artifact_work_directory }}/helm-diff-{{ ansible_facts['system'] | lower }}-{{ download_artifact_goarch }}.tgz"
helm_diff_checksum: "{{ helm_diff_checksums[download_artifact_goarch][helm_diff_version] }}"
2 changes: 1 addition & 1 deletion roles/helm/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ galaxy_info:
dependencies:
- role: forget_package
forget_package_name: "{{ helm_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: vexxhost.kubernetes.download_artifact
download_artifact_url: "{{ helm_download_url }}"
download_artifact_dest: "{{ helm_download_dest }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/helm/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ansible.builtin.apt_repository:
repo: "{{ helm_repository_apt }}"
state: absent
when: ansible_os_family in ['Debian']
when: ansible_facts['os_family'] in ['Debian']

- name: Add bash autocomplete for helm
ansible.builtin.lineinfile:
Expand Down
2 changes: 1 addition & 1 deletion roles/kubeadm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kubeadm_checksums:
1.25.8: e7f0c738e48d905eae145631497a9ef59e792300e5247be2a1fbaa0a8907b308
1.26.3: e9a7dbca77f9576a98af1db8747e9dc13e930e40295eaa259dd99fd6e17a173f

kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubeadm_version }}/bin/{{ ansible_system | lower }}/{{ download_artifact_goarch }}/kubeadm" # noqa: yaml[line-length]
kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubeadm_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubeadm" # noqa: yaml[line-length]
kubeadm_download_dest: /usr/bin/kubeadm
kubeadm_binary_checksum: "{{ kubeadm_checksums[download_artifact_goarch][kubeadm_version] }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/kubeadm/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ galaxy_info:
dependencies:
- role: forget_package
forget_package_name: "{{ kubeadm_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ kubeadm_download_url }}"
download_artifact_dest: "{{ kubeadm_download_dest }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubectl/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kubectl_checksums:
1.25.8: 28cf5f666cb0c11a8a2b3e5ae4bf93e56b74ab6051720c72bb231887bfc1a7c6
1.26.3: 0f62cbb6fafa109f235a08348d74499a57bb294c2a2e6ee34be1fa83432fec1d

kubectl_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/{{ ansible_system | lower }}/{{ download_artifact_goarch }}/kubectl" # noqa: yaml[line-length]
kubectl_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubectl" # noqa: yaml[line-length]
kubectl_download_dest: /usr/bin/kubectl
kubectl_binary_checksum: "{{ kubectl_checksums[download_artifact_goarch][kubectl_version] }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/kubectl/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ galaxy_info:
dependencies:
- role: forget_package
forget_package_name: "{{ kubectl_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ kubectl_download_url }}"
download_artifact_dest: "{{ kubectl_download_dest }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/kubelet/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kubelet_checksums:
1.25.8: 6c995b05b54cc0ce4eb6bf3097565167069b2ce45ba965972430c631c467d239
1.26.3: d360f919c279a05441b27178030c3d17134c1f257c95f4b22bdb28c2290993e7

kubelet_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubelet_version }}/bin/{{ ansible_system | lower }}/{{ download_artifact_goarch }}/kubelet" # noqa: yaml[line-length]
kubelet_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubelet_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubelet" # noqa: yaml[line-length]
kubelet_download_dest: /usr/bin/kubelet
kubelet_binary_checksum: "{{ kubelet_checksums[download_artifact_goarch][kubelet_version] }}"

Expand All @@ -59,7 +59,7 @@ kubelet_sysctls:
kubelet_cri_socket: /run/containerd/containerd.sock

# Node IP address
kubelet_node_ip: "{{ ansible_default_ipv4.address }}"
kubelet_node_ip: "{{ ansible_facts['default_ipv4'].address }}"

# Kubelet hostname
kubelet_hostname: "{{ inventory_hostname_short }}"
2 changes: 1 addition & 1 deletion roles/kubelet/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
- role: cni_plugins
- role: forget_package
forget_package_name: "{{ kubelet_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
download_artifact_url: "{{ kubelet_download_url }}"
download_artifact_dest: "{{ kubelet_download_dest }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ansible.builtin.apt_repository:
repo: "{{ kubernetes_repository_apt }}"
state: absent
when: ansible_os_family in ['Debian']
when: ansible_facts['os_family'] in ['Debian']

- name: Setup control plane
when: inventory_hostname in groups[kubernetes_control_plane_group]
Expand Down
2 changes: 1 addition & 1 deletion roles/runc/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ galaxy_info:
dependencies:
- role: forget_package
forget_package_name: "{{ runc_package_name }}"
when: ansible_pkg_mgr == "apt"
when: ansible_facts['pkg_mgr'] == "apt"
- role: download_artifact
vars:
download_artifact_url: "{{ runc_download_url }}"
Expand Down
Loading