diff --git a/handlers/main.yml b/handlers/main.yml index 2fefca3..c0ef83a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,17 +1,17 @@ --- -- name: reload systemd +- name: Reload systemd ansible.builtin.systemd: daemon_reload: true scope: "{{ k3s_systemd_context }}" become: "{{ k3s_become }}" -- name: reload service +- name: Reload service ansible.builtin.set_fact: k3s_service_reloaded: true become: "{{ k3s_become }}" -- name: restart k3s systemd +- name: Restart k3s systemd ansible.builtin.systemd: name: k3s state: restarted @@ -25,7 +25,7 @@ - not ansible_check_mode become: "{{ k3s_become }}" -- name: restart k3s service +- name: Restart k3s service ansible.builtin.service: name: k3s state: restarted diff --git a/molecule/autodeploy/molecule.yml b/molecule/autodeploy/molecule.yml index 0c283c0..dce188f 100644 --- a/molecule/autodeploy/molecule.yml +++ b/molecule/autodeploy/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/molecule/debug/molecule.yml b/molecule/debug/molecule.yml index 0c283c0..dce188f 100644 --- a/molecule/debug/molecule.yml +++ b/molecule/debug/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 0c283c0..dce188f 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/molecule/highavailabilitydb/molecule.yml b/molecule/highavailabilitydb/molecule.yml index 2fd7196..7adbd77 100644 --- a/molecule/highavailabilitydb/molecule.yml +++ b/molecule/highavailabilitydb/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/molecule/highavailabilityetcd/molecule.yml b/molecule/highavailabilityetcd/molecule.yml index cebb0da..ca67deb 100644 --- a/molecule/highavailabilityetcd/molecule.yml +++ b/molecule/highavailabilityetcd/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/molecule/nodeploy/molecule.yml b/molecule/nodeploy/molecule.yml index 0c283c0..dce188f 100644 --- a/molecule/nodeploy/molecule.yml +++ b/molecule/nodeploy/molecule.yml @@ -23,7 +23,7 @@ scenario: lint: | set -e yamllint -s . - ansible-lint --exclude molecule/ + ansible-lint --exclude molecule/ --exclude meta/ platforms: - name: node1 image: ${MOLECULE_DISTRO:-"geerlingguy/docker-rockylinux8-ansible:latest"} diff --git a/tasks/ensure_cluster.yml b/tasks/ensure_cluster.yml index 767a451..b25f43b 100644 --- a/tasks/ensure_cluster.yml +++ b/tasks/ensure_cluster.yml @@ -38,7 +38,7 @@ mode: 0600 become: "{{ k3s_become }}" notify: - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" - name: Ensure k3s service unit file is present ansible.builtin.template: @@ -49,8 +49,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'systemd' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" - name: Ensure k3s service file is present ansible.builtin.template: @@ -60,8 +60,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'service' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s logrotate file is present @@ -72,8 +72,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'service' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s config file exists @@ -82,8 +82,8 @@ dest: "{{ k3s_config_file }}" mode: 0644 notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure secondary controllers are started diff --git a/tasks/ensure_containerd_registries.yml b/tasks/ensure_containerd_registries.yml index ef21a0a..1270815 100644 --- a/tasks/ensure_containerd_registries.yml +++ b/tasks/ensure_containerd_registries.yml @@ -6,6 +6,6 @@ dest: "{{ k3s_config_dir }}/registries.yaml" mode: 0600 notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" diff --git a/tasks/ensure_installed_node.yml b/tasks/ensure_installed_node.yml index 6584ef8..df85051 100644 --- a/tasks/ensure_installed_node.yml +++ b/tasks/ensure_installed_node.yml @@ -14,7 +14,7 @@ - ctr when: not ansible_check_mode notify: - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s config file exists @@ -23,8 +23,8 @@ dest: "{{ k3s_config_file }}" mode: 0644 notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure cluster token is present when pre-defined @@ -43,7 +43,7 @@ mode: 0600 become: "{{ k3s_become }}" notify: - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" when: k3s_control_token is defined - name: Ensure k3s service unit file is present @@ -54,8 +54,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'systemd' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s service file is present @@ -66,8 +66,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'service' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s logrotate file is present @@ -78,8 +78,8 @@ when: - k3s_service_handler[ansible_service_mgr] == 'service' notify: - - "reload {{ k3s_service_handler[ansible_service_mgr] }}" - - "restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" + - "Reload {{ k3s_service_handler[ansible_service_mgr] }}" + - "Restart k3s {{ k3s_service_handler[ansible_service_mgr] }}" become: "{{ k3s_become }}" - name: Ensure k3s killall script is present diff --git a/tasks/ensure_k3s_auto_deploy.yml b/tasks/ensure_k3s_auto_deploy.yml index 32cfbac..ac638d8 100644 --- a/tasks/ensure_k3s_auto_deploy.yml +++ b/tasks/ensure_k3s_auto_deploy.yml @@ -24,7 +24,7 @@ - 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','') }}" + dest: "{{ k3s_server_manifests_dir }}/{{ item | basename | replace('.j2', '') }}" mode: 0644 loop: "{{ k3s_server_manifests_templates }}" become: "{{ k3s_become }}" @@ -46,7 +46,7 @@ - name: Ensure static pod manifests are copied to controllers ansible.builtin.template: src: "{{ item }}" - dest: "{{ k3s_server_pod_manifests_dir }}/{{ item | basename | replace('.j2','') }}" + dest: "{{ k3s_server_pod_manifests_dir }}/{{ item | basename | replace('.j2', '') }}" mode: 0644 loop: "{{ k3s_server_pod_manifests_templates }}" become: "{{ k3s_become }}" diff --git a/tasks/ensure_k3s_config_files.yml b/tasks/ensure_k3s_config_files.yml index fe9ae2b..78cb90a 100644 --- a/tasks/ensure_k3s_config_files.yml +++ b/tasks/ensure_k3s_config_files.yml @@ -14,7 +14,7 @@ - name: Ensure configuration files are copied to controllers ansible.builtin.template: src: "{{ item }}" - dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2','') }}" + dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2', '') }}" mode: 0644 loop: "{{ k3s_server_config_yaml_d_files }}" become: "{{ k3s_become }}" @@ -24,7 +24,7 @@ - name: Ensure configuration files are copied to agents ansible.builtin.template: src: "{{ item }}" - dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2','') }}" + dest: "{{ k3s_config_yaml_d_dir }}/{{ item | basename | replace('.j2', '') }}" mode: 0644 loop: "{{ k3s_agent_config_yaml_d_files }}" become: "{{ k3s_become }}" diff --git a/tasks/ensure_pre_configuration.yml b/tasks/ensure_pre_configuration.yml index c106c1e..1d5bc06 100644 --- a/tasks/ensure_pre_configuration.yml +++ b/tasks/ensure_pre_configuration.yml @@ -30,7 +30,7 @@ - name: Ensure a count of control nodes is generated from ansible_play_hosts ansible.builtin.set_fact: - k3s_controller_list: "{{ k3s_controller_list + [ item ] }}" + k3s_controller_list: "{{ k3s_controller_list + [item] }}" when: - hostvars[item].k3s_control_node is defined - hostvars[item].k3s_control_node @@ -46,7 +46,7 @@ - name: Ensure a count of control nodes is generated ansible.builtin.set_fact: - k3s_controller_list: "{{ k3s_controller_list + [ item ] }}" + k3s_controller_list: "{{ k3s_controller_list + [item] }}" when: - hostvars[item].k3s_control_node is defined - hostvars[item].k3s_control_node diff --git a/vars/main.yml b/vars/main.yml index 303f2a8..bc08dfc 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -64,10 +64,9 @@ k3s_github_download_url: "{{ k3s_github_url }}/releases/download" # Generate a runtime config dictionary k3s_runtime_config: "{{ (k3s_control_node is defined and k3s_control_node) - | ternary( - (k3s_server | default({})) | combine (k3s_agent | default({})), + | ternary((k3s_server | default({})) | combine(k3s_agent | default({})), (k3s_agent | default({})), - (k3s_server | default({})) | combine (k3s_agent | default({}))) + (k3s_server | default({})) | combine(k3s_agent | default({}))) }}" # Determine if a cluster should be built