feat: Remove Docker install tasks

README.md

@@ -130,7 +130,6 @@ The `k3s_server` dictionary variable will contain flags from the above
 ```yaml
 k3s_server:
   datastore-endpoint: postgres://postgres:verybadpass@database:5432/postgres?sslmode=disable
-  docker: true
   cluster-cidr: 172.20.0.0/16
   flannel-backend: 'none'  # This needs to be in quotes
   disable:

handlers/main.yml

@@ -19,14 +19,3 @@
     - k3s_systemd_restart_k3s is not success
     - not ansible_check_mode
   become: "{{ k3s_become_for_systemd | ternary(true, false, k3s_become_for_all) }}"
-
-- name: restart docker
-  ansible.builtin.systemd:
-    name: docker
-    state: restarted
-    enabled: true
-  register: k3s_systemd_restart_docker
-  failed_when:
-    - k3s_systemd_restart_docker is not success
-    - not ansible_check_mode
-  become: "{{ k3s_become_for_systemd | ternary(true, false, k3s_become_for_all) }}"

molecule/docker/converge.yml

@@ -1,14 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-  vars:
-    molecule_is_test: true
-    k3s_server:
-      https-listen-port: 26443
-      cluster-domain: examplecluster.local
-    k3s_agent:
-      docker: true
-      snapshotter: native
-  roles:
-    - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

molecule/docker/molecule.yml

@@ -1,60 +0,0 @@
----
-
-dependency:
-  name: galaxy
-driver:
-  name: docker
-scenario:
-  test_sequence:
-    - dependency
-    - lint
-    - cleanup
-    - destroy
-    - syntax
-    - create
-    - prepare
-    - check
-    - converge
-    - idempotence
-    - side_effect
-    - verify
-    - cleanup
-    - destroy
-lint: |
-  set -e
-  yamllint -s .
-  ansible-lint --exclude molecule/
-platforms:
-  - name: node1
-    image: "${MOLECULE_DISTRO:-geerlingguy/docker-ubuntu2004-ansible:latest}"
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: true
-    pre_build_image: ${MOLECULE_PREBUILT:-true}
-    networks:
-      - name: k3snet
-  - name: node2
-    image: "${MOLECULE_DISTRO:-geerlingguy/docker-ubuntu2004-ansible:latest}"
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: true
-    pre_build_image: ${MOLECULE_PREBUILT:-true}
-    networks:
-      - name: k3snet
-  - name: node3
-    image: "${MOLECULE_DISTRO:-geerlingguy/docker-ubuntu2004-ansible:latest}"
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: true
-    pre_build_image: ${MOLECULE_PREBUILT:-true}
-    networks:
-      - name: k3snet
-provisioner:
-  name: ansible
-  options:
-    verbose: true
-verifier:
-  name: ansible

molecule/docker/prepare.yml

@@ -1,10 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  tasks:
-    - name: Ensure apt cache is updated and iptables is installed
-      ansible.builtin.apt:
-        name: iptables
-        state: present
-        update_cache: true
-      when: ansible_pkg_mgr == 'apt'

tasks/build/docker/amazon/install.yml

@@ -1,13 +0,0 @@
----
-
-- name: Ensure docker is installed using amazon-linux-extras
-  ansible.builtin.command:
-    cmd: amazon-linux-extras install docker
-  args:
-    creates: /etc/docker
-  notify:
-    - restart docker
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Flush Handlers
-  meta: flush_handlers

tasks/build/docker/archlinux/install-prerequisites.yml

@@ -1 +0,0 @@
----

tasks/build/docker/archlinux/install.yml

@@ -1,16 +0,0 @@
----
-
-- name: Ensure docker is installed using Pacman
-  community.general.pacman:
-    name: docker
-    state: present
-  register: ensure_docker_prerequisites_installed
-  until: ensure_docker_prerequisites_installed is succeeded
-  retries: 3
-  delay: 10
-  notify:
-    - restart docker
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Flush Handlers
-  meta: flush_handlers

tasks/build/docker/debian/install-prerequisites.yml

@@ -1,29 +0,0 @@
----
-
-- name: Ensure Docker prerequisites are installed
-  ansible.builtin.apt:
-    name:
-      - apt-transport-https
-      - ca-certificates
-      - curl
-      - "{{ 'gnupg2' if k3s_os_distribution == 'debian' else 'gnupg-agent' }}"
-      - software-properties-common
-    state: present
-  register: ensure_docker_prerequisites_installed
-  until: ensure_docker_prerequisites_installed is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Ensure Docker APT key is present
-  ansible.builtin.apt_key:
-    url: https://download.docker.com/linux/{{ k3s_os_distribution }}/gpg
-    state: present
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Ensure Docker repository is installed and configured
-  ansible.builtin.apt_repository:
-    filename: docker-ce
-    repo: "deb https://download.docker.com/linux/{{ k3s_os_distribution }} {{ ansible_distribution_release }} stable"
-    update_cache: true
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"

tasks/build/docker/install.yml

@@ -1,16 +0,0 @@
----
-
-- name: Ensure docker is installed
-  ansible.builtin.package:
-    name:
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-    state: present
-  register: ensure_docker_installed
-  until: ensure_docker_installed is succeeded
-  retries: 3
-  delay: 10
-  notify:
-    - restart docker
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"

tasks/build/docker/opensuse-leap/install.yml

@@ -1,16 +0,0 @@
----
-
-- name: Ensure docker is installed using Zypper
-  community.general.zypper:
-    name: docker
-    state: present
-  register: ensure_docker_prerequisites_installed
-  until: ensure_docker_prerequisites_installed is succeeded
-  retries: 3
-  delay: 10
-  notify:
-    - restart docker
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Flush Handlers
-  meta: flush_handlers

tasks/build/docker/redhat/install-prerequisites.yml

@@ -1,56 +0,0 @@
----
-
-- name: Ensure python-dnf is installed
-  ansible.builtin.package:
-    name: "{{ 'python-dnf' if ansible_python_version is version_compare('3.0.0', '<') else 'python3-dnf' }}"
-    state: present
-  register: ensure_python_dnf_installed
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-  until: ensure_python_dnf_installed is succeeded
-  retries: 3
-  delay: 10
-  when: ansible_pkg_mgr == 'dnf'
-
-- name: Ensure Docker prerequisites are installed
-  ansible.builtin.yum:
-    name:
-      - yum-utils
-      - device-mapper-persistent-data
-      - lvm2
-    state: present
-  register: ensure_docker_prerequisites_installed
-  until: ensure_docker_prerequisites_installed is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Check to see if Docker repository is available for this distribution
-  ansible.builtin.uri:
-    url: "https://download.docker.com/linux/{{ k3s_os_distribution }}/{{ ansible_distribution_major_version }}"
-  register: k3s_redhat_repo_check
-  failed_when: false
-  changed_when: false
-
-- name: Ensure Docker repository is installed and configured
-  ansible.builtin.yum_repository:
-    name: docker-ce
-    description: Docker CE Repository
-    baseurl: https://download.docker.com/linux/{{ k3s_os_distribution }}/{{ ansible_distribution_major_version }}/$basearch/stable
-    gpgkey: https://download.docker.com/linux/{{ k3s_os_distribution }}/gpg
-    enabled: true
-    gpgcheck: true
-    state: present
-  when:
-    - k3s_os_distribution not in ['amazon']
-    - k3s_redhat_repo_check.status == 200
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Ensure Docker repository is installed and configured from file
-  ansible.builtin.command:
-    cmd: yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-  args:
-    creates: /etc/yum.repos.d/docker-ce.repo
-  when:
-    - k3s_os_distribution not in ['amazon']
-    - k3s_redhat_repo_check.status != 200
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"

tasks/build/docker/suse/install-prerequisites.yml

@@ -1 +0,0 @@
----

tasks/build/docker/suse/install.yml

@@ -1,16 +0,0 @@
----
-
-- name: Ensure docker is installed using Zypper
-  community.general.zypper:
-    name: docker
-    state: present
-  register: ensure_docker_prerequisites_installed
-  until: ensure_docker_prerequisites_installed is succeeded
-  retries: 3
-  delay: 10
-  notify:
-    - restart docker
-  become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Flush Handlers
-  meta: flush_handlers

tasks/build/preconfigure-k3s-agent-config-yaml-d.yml

@@ -1,18 +0,0 @@
----
-
-- name: Ensure that the config.yaml.d directory exists
-  ansible.builtin.file:
-    state: directory
-    path: "{{ k3s_config_yaml_d_dir }}"
-    mode: 0755
-  when: k3s_agent_config_yaml_d_files | length > 0
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-
-# https://github.com/k3s-io/k3s/pull/3162
-- name: Ensure configuration files are copied to agents
-  ansible.builtin.template:
-    src: "{{ item }}"
-    dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2','') }}"
-    mode: 0644
-  loop: "{{ k3s_agent_config_yaml_d_files }}"
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"

tasks/build/preconfigure-k3s-auto-deploying-manifests-urls.yml

@@ -1,19 +0,0 @@
----
-
-- name: Ensure that the manifests directory exists
-  ansible.builtin.file:
-    state: directory
-    path: "{{ k3s_server_manifests_dir }}"
-    mode: 0755
-  when: k3s_server_manifests_urls | length > 0
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-
-# https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
-- name: Ensure auto-deploying manifests are downloaded to the primary controller
-  ansible.builtin.get_url:
-    url: "{{ item.url }}"
-    dest: "{{ k3s_server_manifests_dir }}/{{ item.filename }}"
-    mode: 0644
-  loop: "{{ k3s_server_manifests_urls }}"
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-  when: not ansible_check_mode

tasks/build/preconfigure-k3s-auto-deploying-manifests.yml

@@ -1,18 +0,0 @@
----
-
-- name: Ensure that the manifests directory exists
-  ansible.builtin.file:
-    state: directory
-    path: "{{ k3s_server_manifests_dir }}"
-    mode: 0755
-  when: k3s_server_manifests_templates | length > 0
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-
-# https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
-- name: Ensure auto-deploying manifests are copied to the primary controller
-  ansible.builtin.template:
-    src: "{{ item }}"
-    dest: "{{ k3s_server_manifests_dir }}/{{ item | basename | replace('.j2','') }}"
-    mode: 0644
-  loop: "{{ k3s_server_manifests_templates }}"
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"

tasks/build/preconfigure-k3s-static-pod-manifests-urls.yml

@@ -1,19 +0,0 @@
----
-
-- name: Ensure that the pod-manifests directory exists
-  ansible.builtin.file:
-    state: directory
-    path: "{{ k3s_server_pod_manifests_dir }}"
-    mode: 0755
-  when: k3s_server_pod_manifests_urls | length > 0
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-
-# https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
-- name: Ensure auto-deploying manifests are downloaded to the primary controller
-  ansible.builtin.get_url:
-    url: "{{ item.url }}"
-    dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename }}"
-    mode: 0644
-  loop: "{{ k3s_server_pod_manifests_urls }}"
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-  when: not ansible_check_mode

tasks/build/preconfigure-k3s-static-pod-manifests.yml

@@ -1,18 +0,0 @@
----
-
-- name: Ensure that the pod-manifests directory exists
-  ansible.builtin.file:
-    state: directory
-    path: "{{ k3s_server_pod_manifests_dir }}"
-    mode: 0755
-  when: k3s_server_pod_manifests_templates | length > 0
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
-
-# https://github.com/k3s-io/k3s/pull/1691
-- name: Ensure static pod manifests are copied to controllers
-  ansible.builtin.template:
-    src: "{{ item }}"
-    dest: "{{ k3s_server_pod_manifests_dir }}/{{ item | basename | replace('.j2','') }}"
-    mode: 0644
-  loop: "{{ k3s_server_pod_manifests_templates }}"
-  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"

tasks/ensure_cluster.yml

@@ -74,11 +74,11 @@
     - not k3s_primary_control_node
   become: "{{ k3s_become_for_systemd | ternary(true, false, k3s_become_for_all) }}"
 
-- import_tasks: ../validate/state/control-plane.yml
+- import_tasks: post_checks_control_plane.yml
   when: not k3s_skip_validation
 
 - name: Flush Handlers
   meta: flush_handlers
 
-- import_tasks: ../validate/state/nodes.yml
+- import_tasks: post_checks_nodes.yml
   when: not k3s_skip_validation

tasks/ensure_installed.yml

@@ -1,11 +1,11 @@
 ---
 
-- include_tasks: install-k3s-directories.yml
+- include_tasks: ensure_directories.yml
   loop: "{{ k3s_ensure_directories_exist }}"
   loop_control:
     loop_var: directory
 
-- include_tasks: install-k3s-node.yml
+- include_tasks: ensure_installed_node.yml
   when:
     - ((k3s_control_node and k3s_controller_list | length == 1)
         or (k3s_primary_control_node and k3s_controller_list | length > 1))
@@ -14,7 +14,7 @@
 - name: Flush Handlers
   meta: flush_handlers
 
-- include_tasks: install-k3s-node.yml
+- include_tasks: ensure_installed_node.yml
   when: k3s_build_cluster
 
 - name: Determine if the systems are already clustered

tasks/ensure_k3s_auto_deploy.yml

@@ -0,0 +1,62 @@
+---
+
+- name: Ensure that the manifests directory exists
+  ansible.builtin.file:
+    state: directory
+    path: "{{ k3s_server_manifests_dir }}"
+    mode: 0755
+  when: >-
+    k3s_server_manifests_templates | length > 0
+    or k3s_server_manifests_urls | length > 0
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+
+- name: Ensure that the pod-manifests directory exists
+  ansible.builtin.file:
+    state: directory
+    path: "{{ k3s_server_pod_manifests_dir }}"
+    mode: 0755
+  when: >-
+    k3s_server_pod_manifests_templates | length > 0
+    or k3s_server_pod_manifests_urls | length > 0
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+
+# https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
+- name: Ensure auto-deploying manifests are copied to the primary controller
+  ansible.builtin.template:
+    src: "{{ item }}"
+    dest: "{{ k3s_server_manifests_dir }}/{{ item | basename | replace('.j2','') }}"
+    mode: 0644
+  loop: "{{ k3s_server_manifests_templates }}"
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+  when:
+    - k3s_server_manifests_templates | length > 0
+
+- name: Ensure auto-deploying manifests are downloaded to the primary controller
+  ansible.builtin.get_url:
+    url: "{{ item.url }}"
+    dest: "{{ k3s_server_manifests_dir }}/{{ item.filename }}"
+    mode: 0644
+  loop: "{{ k3s_server_manifests_urls }}"
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+  when:
+    - not ansible_check_mode
+    - k3s_server_manifests_urls | length > 0
+
+# https://github.com/k3s-io/k3s/pull/1691
+- name: Ensure static pod manifests are copied to controllers
+  ansible.builtin.template:
+    src: "{{ item }}"
+    dest: "{{ k3s_server_pod_manifests_dir }}/{{ item | basename | replace('.j2','') }}"
+    mode: 0644
+  loop: "{{ k3s_server_pod_manifests_templates }}"
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+
+# https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
+- name: Ensure auto-deploying manifests are downloaded to the primary controller
+  ansible.builtin.get_url:
+    url: "{{ item.url }}"
+    dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename }}"
+    mode: 0644
+  loop: "{{ k3s_server_pod_manifests_urls }}"
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+  when: not ansible_check_mode

tasks/ensure_k3s_config_files.yml

@@ -5,7 +5,9 @@
     state: directory
     path: "{{ k3s_config_yaml_d_dir }}"
     mode: 0755
-  when: k3s_server_config_yaml_d_files | length > 0
+  when: >-
+    k3s_server_config_yaml_d_files | length > 0
+    or k3s_agent_config_yaml_d_files | length > 0
   become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
 
 # https://github.com/k3s-io/k3s/pull/3162
@@ -16,3 +18,14 @@
     mode: 0644
   loop: "{{ k3s_server_config_yaml_d_files }}"
   become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+  when: k3s_control_node
+
+# https://github.com/k3s-io/k3s/pull/3162
+- name: Ensure configuration files are copied to agents
+  ansible.builtin.template:
+    src: "{{ item }}"
+    dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2','') }}"
+    mode: 0644
+  loop: "{{ k3s_agent_config_yaml_d_files }}"
+  become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
+  when: not k3s_control_node

tasks/ensure_pre_configuration.yml

@@ -127,10 +127,3 @@
 
   when: k3s_registration_address is not defined
         or k3s_control_delegate is not defined
-
-- name: Ensure k3s_runtime_config is set for agents
-  ansible.builtin.set_fact:
-    k3s_runtime_config: "{{ (k3s_agent | default({})) }}"
-  when:
-    - k3s_agent is defined
-    - (k3s_control_node is not defined or not k3s_control_node)

tasks/ensure_uninstalled.yml

@@ -10,13 +10,6 @@
     path: /usr/local/bin/k3s-uninstall.sh
   register: check_k3s_uninstall_script
 
-- name: Check to see if docker is present
-  ansible.builtin.command:
-    cmd: which docker
-  failed_when: false
-  changed_when: false
-  register: check_k3s_docker_path
-
 - name: Run k3s-killall.sh
   ansible.builtin.command:
     cmd: /usr/local/bin/k3s-killall.sh
@@ -47,10 +40,3 @@
     - k3s_install_hard_links
     - not ansible_check_mode
   become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Clean up Docker
-  ansible.builtin.command:
-    cmd: docker system prune -a --force
-  when:
-    - ("docker" in k3s_runtime_config and k3s_runtime_config.docker)
-    - check_k3s_docker_path.rc == 0

tasks/main.yml

@@ -1,5 +1,5 @@
 ---
 
-- import_tasks: validate/pre-flight.yml
+- import_tasks: pre_checks.yml
 
-- include_tasks: state-{{ (k3s_state | lower) | default('installed') }}.yml
+- include_tasks: state_{{ (k3s_state | lower) | default('installed') }}.yml

tasks/post_checks_uninstalled.yml

@@ -9,18 +9,6 @@
   changed_when: false
   register: check_k3s_process
 
-- name: Check that docker is not running
-  ansible.builtin.command:
-    cmd: pgrep docker
-  failed_when:
-    - check_k3s_docker_process.rc == 0
-    - not ansible_check_mode
-  changed_when: false
-  register: check_k3s_docker_process
-  when:
-    - k3s_runtime_config.docker is defined
-    - k3s_runtime_config.docker
-
 - name: Fail if k3s binaries have not been removed
   ansible.builtin.stat:
     path: "{{ k3s_install_dir }}/{{ item }}"

tasks/pre_checks.yml

@@ -0,0 +1,88 @@
+---
+
+- name: Check that k3s_state is a supported value
+  ansible.builtin.assert:
+    that:
+      - k3s_state in k3s_valid_states
+    fail_msg: "k3s_state not valid. Check README.md for details."
+    success_msg: "k3s_state is valid."
+  when: k3s_state is defined
+
+- name: Check that Ansible v{{ ansible_version.string }} is supported by this role
+  ansible.builtin.assert:
+    that:
+      - ansible_version.string is version_compare(k3s_ansible_min_version, '>=')
+    fail_msg: >-
+      Ansible v{{ ansible_version.string }} is not supported by this role.
+      Please install >= v{{ k3s_ansible_min_version }}.
+    success_msg: "Ansible v{{ ansible_version.string }} is supported."
+  become: false
+  delegate_to: localhost
+  run_once: true
+  when:
+    - not k3s_skip_validation
+    - not k3s_skip_env_checks
+
+- name: Check that Python v{{ ansible_python_version }} is supported by this role
+  ansible.builtin.assert:
+    that:
+      - ansible_python_version is version_compare(k3s_python_min_version, '>=')
+    fail_msg: >-
+      Python v{{ ansible_python_version }} is not supported by this role.
+      Please install >= v{{ k3s_python_min_version }}.
+    success_msg: "Python v{{ ansible_python_version }} is supported."
+  become: false
+  delegate_to: localhost
+  run_once: true
+  when:
+    - not k3s_skip_validation
+    - not k3s_skip_env_checks
+
+- include_tasks: pre_checks_version.yml
+  when:
+    - (k3s_release_version is not defined
+        or not k3s_release_version
+        or k3s_release_version is not regex('\\+k3s[1-9]$'))
+    - not k3s_airgap
+
+- include_tasks: pre_checks_cgroups.yml
+  loop: "{{ k3s_cgroup_subsys }}"
+  loop_control:
+    loop_var: cgroup
+  when:
+    - not k3s_skip_validation
+    - not k3s_skip_env_checks
+
+- include_tasks: pre_checks_packages.yml
+  loop: "{{ k3s_check_packages[k3s_os_distribution_version] }}"
+  loop_control:
+    loop_var: package
+  when:
+    - not k3s_skip_validation
+    - not k3s_skip_env_checks
+    - k3s_check_packages[k3s_os_distribution_version] is defined
+
+- include_tasks: pre_checks_issue_data.yml
+  when:
+    - pyratlabs_issue_controller_dump is defined
+    - pyratlabs_issue_controller_dump
+
+- import_tasks: pre_checks_variables.yml
+  when:
+    - not k3s_skip_validation
+
+- import_tasks: pre_checks_experimental_variables.yml
+  when:
+    - not k3s_skip_validation
+
+- import_tasks: pre_checks_unsupported_rootless.yml
+  when:
+    - k3s_runtime_config.rootless is defined
+    - k3s_runtime_config.rootless
+    - not k3s_skip_validation
+
+- import_tasks: pre_checks_control_node_count.yml
+  when:
+    - k3s_build_cluster is defined
+    - k3s_build_cluster
+    - not k3s_skip_validation

tasks/pre_checks_issue_data.yml

@@ -80,6 +80,8 @@
 
 - name: Fail the play
   ansible.builtin.fail:
-    msg: "Please include the output of {{ playbook_dir }}/pyratlabs-issue-dump.txt in your bug report."
+    msg: >-
+      Please include the output of
+      {{ playbook_dir }}/pyratlabs-issue-dump.txt in your bug report.
   delegate_to: localhost
   run_once: true

tasks/pre_checks_version.yml

@@ -1,6 +1,5 @@
 ---
 
-# TODO: Prevent or circumvent versioning when k3s_airgap
 - name: Ensure k3s_release_version is set to default if false
   ansible.builtin.set_fact:
     k3s_release_version: "{{ k3s_release_channel }}"

tasks/state-installed.yml

@@ -1,94 +0,0 @@
----
-
-- import_tasks: build/preconfigure-k3s.yml
-
-- import_tasks: teardown/drain-and-remove-nodes.yml
-
-- import_tasks: build/get-version.yml
-  when:
-    - k3s_release_version is not defined
-      or not k3s_release_version
-      or k3s_release_version is not regex('\\+k3s[1-9]$')
-    - not k3s_airgap
-
-- import_tasks: validate/main.yml
-  when: not k3s_skip_validation
-
-- import_tasks: build/get-systemd-context.yml
-
-- name: Ensure docker installation tasks are run
-  block:
-
-    - include_tasks: build/docker/{{ k3s_os_family }}/install-prerequisites.yml
-
-    - import_tasks: build/docker/install.yml
-      when: k3s_os_distribution not in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
-
-    - include_tasks: build/docker/{{ k3s_os_distribution }}/install.yml
-      when: k3s_os_distribution in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
-
-  when:
-    - ('docker' in k3s_runtime_config and k3s_runtime_config.docker)
-    - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
-
-- name: Flush Handlers
-  meta: flush_handlers
-
-- import_tasks: build/download-k3s.yml
-  when:
-    - not k3s_airgap
-
-- import_tasks: build/airgap-k3s.yml
-  when:
-    - k3s_airgap
-
-- import_tasks: build/preconfigure-k3s-auto-deploying-manifests.yml
-  when:
-    - k3s_primary_control_node
-    - k3s_server_manifests_templates | length > 0
-
-- import_tasks: build/preconfigure-k3s-auto-deploying-manifests-urls.yml
-  when:
-    - k3s_primary_control_node
-    - k3s_server_manifests_urls | length > 0
-
-- import_tasks: build/preconfigure-k3s-static-pod-manifests.yml
-  when:
-    - k3s_control_node
-    - k3s_server_pod_manifests_templates | length > 0
-
-- import_tasks: build/preconfigure-k3s-static-pod-manifests-urls.yml
-  when:
-    - k3s_control_node
-    - k3s_server_pod_manifests_urls | length > 0
-
-- import_tasks: build/preconfigure-k3s-server-config-yaml-d.yml
-  when:
-    - k3s_control_node
-    - k3s_server_config_yaml_d_files | length > 0
-
-- import_tasks: build/preconfigure-k3s-agent-config-yaml-d.yml
-  when:
-    - not k3s_control_node
-    - k3s_agent_config_yaml_d_files | length > 0
-
-- import_tasks: build/install-k3s.yml
-
-- name: Ensure containerd installation tasks are run
-  block:
-    - include_tasks: build/containerd/registries.yml
-  when:
-    - k3s_registries is defined
-    - (k3s_runtime_config.docker is not defined or not k3s_runtime_config.docker)
-    - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
-
-- include_tasks: validate/configuration/cluster-init.yml
-  when:
-    - k3s_control_delegate is defined
-    - k3s_control_delegate == inventory_hostname
-
-- import_tasks: build/configure-k3s-cluster.yml
-  when:
-    - k3s_build_cluster is defined
-    - k3s_build_cluster
-    - k3s_registration_address is defined

tasks/state-restarted.yml

@@ -1,5 +0,0 @@
----
-
-- import_tasks: operate/stop-k3s.yml
-
-- import_tasks: operate/start-k3s.yml

tasks/state-started.yml

@@ -1,3 +0,0 @@
----
-
-- import_tasks: operate/start-k3s.yml

tasks/state-stopped.yml

@@ -1,3 +0,0 @@
----
-
-- import_tasks: operate/stop-k3s.yml

tasks/state-uninstalled.yml

@@ -1,25 +0,0 @@
----
-
-- import_tasks: build/preconfigure-k3s.yml
-
-- import_tasks: teardown/drain-and-remove-nodes.yml
-
-- import_tasks: teardown/uninstall-k3s.yml
-
-- name: Ensure docker uninstall tasks are run
-  block:
-
-    - import_tasks: teardown/docker/uninstall.yml
-      when: k3s_os_distribution not in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
-
-    - include_tasks: teardown/docker/{{ k3s_os_distribution }}/uninstall.yml
-      when: k3s_os_distribution in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
-
-    - include_tasks: teardown/docker/{{ k3s_os_family }}/uninstall-prerequisites.yml
-
-  when:
-    - ('docker' in k3s_runtime_config and k3s_runtime_config.docker)
-    - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
-
-- import_tasks: validate/state/uninstalled.yml
-  when: not k3s_skip_validation

tasks/state-validated.yml

@@ -1,7 +0,0 @@
----
-
-- import_tasks: validate/pre-flight.yml
-
-- import_tasks: validate/main.yml
-
-- import_tasks: validate/post-install.yml

tasks/state_downloaded.yml

@@ -1,12 +1,12 @@
 ---
 
-- import_tasks: build/get-version.yml
+- import_tasks: pre_checks_version.yml
   when:
     - k3s_release_version is not defined or not k3s_release_version
     - not k3s_airgap
 
-- import_tasks: build/download-k3s.yml
+- import_tasks: ensure_downloads.yml
   when: not k3s_airgap
 
-- import_tasks: build/airgap-k3s.yml
+- import_tasks: ensure_uploads.yml
   when: k3s_airgap

tasks/state_installed.yml

@@ -0,0 +1,40 @@
+---
+
+- import_tasks: ensure_pre_configuration.yml
+
+- import_tasks: ensure_drain_and_remove_nodes.yml
+
+- import_tasks: determine_systemd_context.yml
+
+- name: Flush Handlers
+  meta: flush_handlers
+
+- import_tasks: ensure_downloads.yml
+  when: not k3s_airgap
+
+- import_tasks: ensure_uploads.yml
+  when: k3s_airgap
+
+- import_tasks: ensure_k3s_auto_deploy.yml
+  when:
+    - k3s_primary_control_node
+
+- import_tasks: ensure_k3s_config_files.yml
+
+- import_tasks: ensure_installed.yml
+
+- include_tasks: ensure_containerd_registries.yml
+  when:
+    - k3s_registries is defined
+    - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
+
+- include_tasks: pre_checks_cluster.yml
+  when:
+    - k3s_control_delegate is defined
+    - k3s_control_delegate == inventory_hostname
+
+- import_tasks: ensure_cluster.yml
+  when:
+    - k3s_build_cluster is defined
+    - k3s_build_cluster
+    - k3s_registration_address is defined

tasks/state_restarted.yml

@@ -0,0 +1,5 @@
+---
+
+- import_tasks: ensure_stopped.yml
+
+- import_tasks: ensure_started.yml

tasks/state_started.yml

@@ -0,0 +1,3 @@
+---
+
+- import_tasks: ensure_started.yml

tasks/state_stopped.yml

@@ -0,0 +1,3 @@
+---
+
+- import_tasks: ensure_stopped.yml

tasks/state_uninstalled.yml

@@ -0,0 +1,10 @@
+---
+
+- import_tasks: ensure_pre_configuration.yml
+
+- import_tasks: ensure_drain_and_remove_nodes.yml
+
+- import_tasks: ensure_uninstalled.yml
+
+- import_tasks: post_checks_uninstalled.yml
+  when: not k3s_skip_validation

tasks/state_validated.yml

@@ -0,0 +1,5 @@
+---
+
+- import_tasks: post_checks_control_plane.yml
+
+- import_tasks: post_checks_nodes.yml

tasks/teardown/docker/amazon/uninstall.yml

@@ -1,8 +0,0 @@
----
-
-- name: Ensure docker is uninstalled using amazon-linux-extras
-  ansible.builtin.command:
-    cmd: amazon-linux-extras uninstall docker
-  register: uninstall_docker_from_amazon_linux
-  changed_when: uninstall_docker_from_amazon_linux.rc == 0
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/archlinux/uninstall.yml

@@ -1,11 +0,0 @@
----
-
-- name: Ensure docker is uninstalled using Pacman
-  community.general.pacman:
-    name: docker
-    state: absent
-  register: ensure_docker_uninstalled
-  until: ensure_docker_uninstalled is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/debian/uninstall-prerequisites.yml

@@ -1,15 +0,0 @@
----
-
-- name: Ensure Docker repository is uninstalled
-  ansible.builtin.apt_repository:
-    filename: docker-ce
-    repo: "deb https://download.docker.com/linux/{{ k3s_os_distribution }} {{ ansible_distribution_release }} stable"
-    update_cache: false
-    state: absent
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"
-
-- name: Ensure Docker APT key is uninstalled
-  ansible.builtin.apt_key:
-    url: https://download.docker.com/linux/{{ k3s_os_distribution }}/gpg
-    state: absent
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/opensuse-leap/uninstall.yml

@@ -1,11 +0,0 @@
----
-
-- name: Ensure docker is installed using Zypper
-  community.general.zypper:
-    name: docker
-    state: absent
-  register: ensure_docker_uninstalled
-  until: ensure_docker_uninstalled is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/redhat/uninstall-prerequisites.yml

@@ -1,13 +0,0 @@
----
-
-- name: Ensure Docker repository is removed
-  ansible.builtin.yum_repository:
-    name: docker-ce
-    description: Docker CE Repository
-    baseurl: https://download.docker.com/linux/{{ k3s_os_distribution }}/{{ ansible_distribution_major_version }}/$basearch/stable
-    gpgkey: https://download.docker.com/linux/{{ k3s_os_distribution }}/gpg
-    enabled: false
-    gpgcheck: true
-    state: absent
-  when: k3s_os_distribution not in ['amazon']
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/suse/uninstall-prerequisites.yml

@@ -1 +0,0 @@
----

tasks/teardown/docker/suse/uninstall.yml

@@ -1,11 +0,0 @@
----
-
-- name: Ensure docker is uninstalled using Zypper
-  community.general.zypper:
-    name: docker
-    state: absent
-  register: ensure_docker_uninstalled
-  until: ensure_docker_uninstalled is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/teardown/docker/uninstall.yml

@@ -1,14 +0,0 @@
----
-
-- name: Ensure docker is uninstalled
-  ansible.builtin.package:
-    name:
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-    state: absent
-  register: ensure_docker_uninstalled
-  until: ensure_docker_uninstalled is succeeded
-  retries: 3
-  delay: 10
-  become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"

tasks/validate/environment/local/packages.yml

@@ -1,13 +0,0 @@
----
-
-- name: Check that Ansible v{{ ansible_version.string }} is supported by this role
-  ansible.builtin.assert:
-    that:
-      - ansible_version.string is version_compare(k3s_ansible_min_version, '>=')
-    fail_msg: >-
-      Ansible v{{ ansible_version.string }} is not supported by this role.
-      Please install >= v{{ k3s_ansible_min_version }}.
-    success_msg: "Ansible v{{ ansible_version.string }} is supported."
-  become: false
-  delegate_to: localhost
-  run_once: true

tasks/validate/main.yml

@@ -1,24 +0,0 @@
----
-
-- include_tasks: environment/remote/packages.yml
-  loop: "{{ k3s_check_packages[k3s_os_distribution_version] }}"
-  loop_control:
-    loop_var: package
-  when:
-    - not k3s_skip_validation
-    - not k3s_skip_env_checks
-    - k3s_check_packages[k3s_os_distribution_version] is defined
-
-- import_tasks: configuration/variables.yml
-
-- import_tasks: configuration/experimental-variables.yml
-
-- import_tasks: configuration/unsupported-rootless.yml
-  when:
-    - k3s_runtime_config.rootless is defined
-    - k3s_runtime_config.rootless
-
-- import_tasks: configuration/control-node-count.yml
-  when:
-    - k3s_build_cluster is defined
-    - k3s_build_cluster

tasks/validate/post-install.yml

@@ -1,5 +0,0 @@
----
-
-- import_tasks: state/control-plane.yml
-
-- import_tasks: state/nodes.yml

tasks/validate/pre-flight.yml

@@ -1,27 +0,0 @@
----
-
-- name: Check that k3s_state is a supported value
-  ansible.builtin.assert:
-    that:
-      - k3s_state in k3s_valid_states
-    fail_msg: "k3s_state not valid. Check README.md for details."
-    success_msg: "k3s_state is valid."
-  when: k3s_state is defined
-
-- import_tasks: environment/local/packages.yml
-  when:
-    - not k3s_skip_validation
-    - not k3s_skip_env_checks
-
-- include_tasks: environment/remote/cgroups.yml
-  loop: "{{ k3s_cgroup_subsys }}"
-  loop_control:
-    loop_var: cgroup
-  when:
-    - not k3s_skip_validation
-    - not k3s_skip_env_checks
-
-- include_tasks: environment/local/issue-data.yml
-  when:
-    - pyratlabs_issue_controller_dump is defined
-    - pyratlabs_issue_controller_dump

vars/main.yml

@@ -3,6 +3,7 @@
 # Minimum supported versions
 k3s_min_version: 1.19.3
 k3s_ansible_min_version: 2.9.16
+k3s_python_min_version: 3.6
 
 # Valid states for this role
 k3s_valid_states:
@@ -55,14 +56,26 @@ k3s_api_releases: "{{ k3s_api_url }}/v1-release/channels"
 # Download location for releases
 k3s_github_download_url: "{{ k3s_github_url }}/releases/download"
 
-# Generate a runtime config dictionary for validation
+# Generate a runtime config dictionary
-k3s_runtime_config: "{{ (k3s_server | default({})) | combine (k3s_agent | default({})) }}"
+k3s_runtime_config: "{{
+  (k3s_control_node is defined and k3s_control_node)
+  | ternary(
+      (k3s_server | default({})) | combine (k3s_agent | default({})),
+      (k3s_agent | default({})),
+      (k3s_server | default({})) | combine (k3s_agent | default({})))
+}}"
+
+# Determine if a cluster should be built
+k3s_conf_build_cluster: "{{
+  not ((ansible_play_hosts_all | length < 2)
+  and k3s_registration_address is not defined)
+}}"
 
 # Empty array for counting the number of control plane nodes
 k3s_controller_list: []
 
 # Control plane port default
-k3s_control_plane_port: 6443
+k3s_control_plane_port: "{{ k3s_runtime_config['https-listen-port'] | default(6443) }}"
 
 # Default to the "system" systemd context, this will be "user" when running rootless
 k3s_systemd_context: system
@@ -161,6 +174,7 @@ k3s_deprecated_config:
     correction: "docker: false"
     when: 1.20.0
 
+# cgroup checks
 k3s_cgroup_subsys:
   - name: memory
     documentation: |