Merge branch 'master' into fix/tls-san-api-endpoint

Author: guiand888

README.md

@@ -38,6 +38,17 @@ It is also recommended that all managed nodes disable firewalls and swap. See [K
 $ ansible-galaxy collection install git+https://github.com/k3s-io/k3s-ansible.git
 ```
 
+Alternatively, add it to the [`requirement.yaml` file of your Ansible project](https://docs.ansible.com/ansible/latest/collections_guide/collections_installing.html#install-multiple-collections-with-a-requirements-file) as follows:
+
+```yaml
+collections:
+  - name: https://github.com/k3s-io/k3s-ansible.git
+    type: git
+    version: <comit-ish>
+```
+
+As a comit-ish, you can use a branch, a version tag, or a specific commit.
+
 ### From source
 
 Alternatively to an installation with `ansible-galaxy`, the `k3s-ansible` repository can simply be cloned from github:

inventory-sample.yml

@@ -26,6 +26,7 @@ k3s_cluster:
     # Optional vars
     # extra_server_args: ""
     # extra_agent_args: ""
+    # extra_install_envs: { 'INSTALL_K3S_SKIP_SELINUX_RPM': 'true' }
     # cluster_context: k3s-ansible
     # api_port: 6443
     # k3s_server_location: /var/lib/rancher/k3s

roles/k3s_agent/defaults/main.yml

@@ -4,3 +4,4 @@ k3s_server_location: "/var/lib/rancher/k3s"  # noqa var-naming[no-role-prefix]
 systemd_dir: "/etc/systemd/system"  # noqa var-naming[no-role-prefix]
 api_port: 6443  # noqa var-naming[no-role-prefix]
 extra_agent_args: "" # noqa var-naming[no-role-prefix]
+extra_install_envs: {} # noqa var-naming[no-role-prefix]

roles/k3s_agent/tasks/main.yml

@@ -27,12 +27,18 @@
         mode: "0755"
 
     - name: Download K3s binary
-      ansible.builtin.command:
+      # For some reason, ansible-lint thinks using enviroment with command is an error
+      # even though its valid https://ansible.readthedocs.io/projects/lint/rules/inline-env-var/#correct-code
+      ansible.builtin.command: # noqa inline-env-var
         cmd: /usr/local/bin/k3s-install.sh
-      environment:
-        INSTALL_K3S_SKIP_START: "true"
-        INSTALL_K3S_VERSION: "{{ k3s_version }}"
-        INSTALL_K3S_EXEC: "agent"
+      # Ensures that extra_install_envs are combined with required env vars
+      environment: >-
+        {{ extra_install_envs | combine({
+          "INSTALL_K3S_SKIP_START": "true",
+          "INSTALL_K3S_SYSTEMD_DIR": systemd_dir,
+          "INSTALL_K3S_VERSION": k3s_version,
+          "INSTALL_K3S_EXEC": "agent"
+        }) }}
       changed_when: true
 
 - name: Compute final agent arguments

roles/k3s_server/defaults/main.yml

@@ -9,3 +9,4 @@ server_group: server  # noqa var-naming[no-role-prefix]
 agent_group: agent  # noqa var-naming[no-role-prefix]
 use_external_database: false # noqa var-naming[no-role-prefix]
 extra_server_args: "" # noqa var-naming[no-role-prefix]
+extra_install_envs: {} # noqa var-naming[no-role-prefix]

roles/k3s_server/tasks/main.yml

@@ -27,11 +27,16 @@
         mode: "0755"
 
     - name: Download K3s binary
-      ansible.builtin.command:
+      # For some reason, ansible-lint thinks using enviroment with command is an error
+      # even though its valid https://ansible.readthedocs.io/projects/lint/rules/inline-env-var/#correct-code
+      ansible.builtin.command: # noqa inline-env-var
         cmd: /usr/local/bin/k3s-install.sh
-      environment:
-        INSTALL_K3S_SKIP_START: "true"
-        INSTALL_K3S_VERSION: "{{ k3s_version }}"
+      # Ensures that extra_install_envs are combined with required env vars
+      environment: >-
+        {{ extra_install_envs | combine({
+          "INSTALL_K3S_SKIP_START": "true",
+          "INSTALL_K3S_VERSION": k3s_version,
+        }) }}
       changed_when: true
 
 - name: Add K3s autocomplete to user bashrc

roles/k3s_upgrade/defaults/main.yml

@@ -2,3 +2,4 @@
 systemd_dir: /etc/systemd/system  # noqa var-naming[no-role-prefix]
 server_group: server  # noqa var-naming[no-role-prefix]
 agent_group: agent  # noqa var-naming[no-role-prefix]
+extra_install_envs: {} # noqa var-naming[no-role-prefix]

roles/k3s_upgrade/tasks/main.yml

@@ -33,11 +33,15 @@
       loop: "{{ k3s_service_files.files }}"
 
     - name: Install new K3s Version
-      ansible.builtin.command:
+      # For some reason, ansible-lint thinks using enviroment with command is an error
+      # even though its valid https://ansible.readthedocs.io/projects/lint/rules/inline-env-var/#correct-code
+      ansible.builtin.command: # noqa inline-env-var
         cmd: /usr/local/bin/k3s-install.sh
-      environment:
-        INSTALL_K3S_SKIP_START: "true"
-        INSTALL_K3S_VERSION: "{{ k3s_version }}"
+      environment: >-
+          {{ extra_install_envs | combine({
+            "INSTALL_K3S_SKIP_START": "true",
+            "INSTALL_K3S_VERSION": k3s_version,
+          }) }}
       changed_when: true
 
     - name: Restore K3s service